Mostly grammar fixes

These are mostly grammar fixes, with a few stylistic changes.