Updated some of load/save