Version for plot graph 

Version for plot graph + other bug corrections