More readable command definitions
Forgot to terminate USAGE string.  Oops.
Fixed filemame_or_id test that was poluting local directory