Fix spew on error, command name, implement -h partial matching

It was trivial to do the partial matching while I was in there anyway.