Issue #467

plus a bunch of whitespace fixes to pad it out!!