Fix saving of CoreData (finally!!)
cleanups