Made some of the command line options a bit more useful