Map fixes and a PDA tweak.

Fixes #2958, #2919, #2876, PARTS of #2813, and #2790.