Whitespace corrections, a couple bug fixes, replacing a format string with constructing the string the normal way (just to reduce confusion.)
Merge pull request #1 from ben-zen/master

Whitespace and a couple fixes.