fix assorted minor problems

Please consider using Markdown for this; it would be a lot easier to edit.
Merge pull request #3 from RichMorin/patch-1

fix assorted minor problems