Spelling corrections, and minor cleanups