command line option fixes