lots of plotting tweaks