mostly fix save/load