Added a bunch of command line options.