minor changes to option names and passing