Map tweaks
Merge pull request #1038 from Rei1226/rei25

Map tweaks