Saving Fixes/Improvements