core data gefixt
merged
merging some more