patched up the command line parsers to be a bit nicer...