Added more command line options.