Updates to the command line argument / config file code.