Fixed some bugs in the graph