cleaned up command line switches
fixes