lots of little plotting tweaks
merged