Save Fixes

Altered the save so that it doesn't block while waiting on a save to finish.