Some clean-up of options
It's like riding a bike. Sort of. Finally have a consistent options update pattern
Cleaning up and id pre-release
Ghetto working