Improve help messages slightly.
Well gosh, that was a bug then wasn't it.
pyflakes and pep8 fixes.