Lots of tweaks and fixes, including zone integration