Bleeding edge

Fixes a zas problem, and some map changes.