Fixed two memory leaks & added support to load mid-game without crash