added a whole bunch of options