Save and load from the datastore.
Minor changes.