Modified old CL switches to use double dash prefixes, fixed master's ret...

...urn codes