command line handling changes