Some save-related changes(BenLewis)

To fix unresponsiveness during saving.