Added a bunch of command-line arguments.