updates to option handling