Fix command line help documentation

This fixes #9 and does some general cleanup of the various options for the different subcommands.