Minor plot tweaks