* Fixed includes in setup
* Efficiency improvements to state
* Efficiency tweaks for state
* Removed problematic unnecessary import
* Fixed bug introduced while doing max_upd handling