More save changes to fix lua errors on load... hope it works this time