Fix to options model
misc admin cleanup
Server stats cleanup.
Stat and upgrade update