Fixes on the graph; no known bugs remaining in it