Enhance handling of command line errors, and "--help" & "--version"