lots of plotting updates