Changes/improvements to plotter