addendum schemas; more tracing; Entity implements Map; misc. fixes