reformat
more subcommand tweaks