more plot2d changes, cleanup