Improved save/load performance and some minor tweaks.