lots of plotting tweaks
merge