Made some improvements to the command line.