More improvements to file save/load.