Add persistent data to save locations; use for saving persistent.

Also, safely save normal save data.