Fixed several graphing bugs