Final graphing improvements code, other stuff