Added command line.

Added command line. Also cleaned up a bit more.