more work on unification of entity-types