Fixes to graph ploting added