Fixed the command line handler a bit.