Changed subcommands to use - rather than _, for friendliness.