Cleanups to graphmaker
Graphing update