some coredata changes + fixing functionality

coredata changes are experimental but it's still working (make sure to
reset your simulator)