Version 1.0 Commit and StateManager Fix

Fixes state reloading when changing states.