speedup at diagramobject lookup
cleanups