Small corrections to the command line utility (mis-named)