Small grammar fixes and tweaks