Second round of grammatical edits