Added a couple command-line options.