Adding more options to the CLI.
Refactored how the command line options are parsed.