more massageing of core data and updates for dataentry to match