Greatly improve the plotting of graphs