changes to option parser