shortened commands, fixed cli options