lots of plot tweaks