fixed saving and reloading after recent changes