Revert to 1 save file, fixes