Make small improvements to the command-line tool