Brig fixes round three.

Some mapping fixes from group playtesting on dev.