Even more save fixes

Need to rethink how and where saving and loading should be initiated.