A few improvements to the graph drawing stuff