minor fixes and async trackEdge collecting