some enhancements, less IntMap churn in DynBuildingGraph