integrated new entitygraph + bugfixes