Mostly trivial grammatical improvements