Fix loading save state

Undo some of last commit and move save state and load state to the end
of frame