Improve help text output

@L7R7 Did the rebasing myself. Here's the result of your changes applied to the new per-command help texsts.