Fix #46 and #74

Needs testing but hopefully this annoying loading saved game bug works..
caused me alot of hours to debug, and it's my own fault.. :)

Closes #46 and #74.