More plot tweaks and bug fixes.