Map fixes
Merge pull request #161 from 5150Joker/dev

Map fixes