Updated save and load, debugged it