tweaks to command line handling