Corrections, and stylistic fixes.