Fixed multiple issues, not commiting broken changes to the save/load yet (Issue #59). I will upload a soft solution if other methods fail.