Improvements to loading and saving.