Wording fixes with suggestions from @pagojo