Lots of work on options, updater works