lots of changes to plotter