fix up our grabbing of options