Made adjustments to command-line options.