Refactoring and bug fixes

• Core Data save refactoring
• Add game crash fix