Fixed some issues with the graph