Made some fixes to the save structure.