Minor cleanup of command line parsing errors, etc.
Updated version number to 1.2.0