updated bugs for Core Data!