added a bunch of options