Some changes to command line parsing