added subcommands, changed defaults to simplify CLI