Aesethetic Rejig of command line options. All broken.