Correct on all points there. Wording should be slightly less confusing now.