Added command line switches for all the current options.