Merge pull request #1 from d3athrow/Bleeding-Edge

Bleeding edge
Map Fixes
Merge pull request #1640 from Shaska-/Map_Fixes

Map fixes