collector rewrite, minor graphBuilder changes