* Cleanup
* Fix stat updates -> stat changes are immediate