misc cleanups to graphing code so sizing is easier and
change the labels in the legends