beginning cleanup of the graph and graph builder code, still more work to do