Fixed up some of the options implementation