Fixed more memory issues and continued work on save upgrade.