Cleanup and fixed command line bug.