commandline improvements