Whitespace and a couple fixes.

Whitespace corrections, a couple bug fixes, replacing a format string with constructing the string the normal way (just to reduce confusion.)