list of options and a few small changes