Minor fixes and a lot better help formatting

...well, maybe not so minor.