Tweak format of command help files and do some further command cleanup