Lawyering up

- wrap to 80 cols
- fix some typos
Merge branch 'jden-patch-1'