run-cli -> run, fix help formatting