a few more wording tweaks
Merge branch 'benja-edits'