Fix typos

A number of small typo fixes. This supersedes pull request #135