Various improvements to the graphs