Improvements to --help

Sorry for the whitespace noise, my editor cleans them up automatically.