Improvements to graphing