Added more commandline options.  Currently does nothing