Merge pull request #128 from Hawk-It/map_fixes

Map fixes
dialog fix
Merge pull request #129 from Hawk-It/dialog

dialog fix