removed and changed command line switches