Added some graphing enhancements