More Core Data Work, NSFetchedResultsController and minor UICollectionView updates