A few more tweaks, and grammar fixes