Cleanup on the graphing side

Minor tweaks for the graphing side.  Wish to just get our trees aligned so I can pull from you directly