Lots of grammatical fixes