save and load improvements