Some final work on the command line interface.