Map fixes, tiny changes
Merge pull request #949 from Rei1226/rei24

Map fixes, tiny changes