sorted out tcu inserts and replaced most nid references with entity_id