Graphing improvements
Graphing improvements