added NSFetchedResultsController + minor improvements