General touchups on the command line tool.