A few tweaks, clarifications and comments.
Merge pull request #26 from pat/master

A few small improvements