Some encoding stuff fixed
Some changes, but Core Data incompatible