Fixed bugs
Fixed graph plotter