assorted formatting and typo fixes
Merge pull request #606 from jonboulle/master

assorted formatting and typo fixes