Changed command line options according to Kevin's revisions.