Fixed issues with parsing the command line to improve ease of use