Fixed #1137
Added map changes for #1120
Partial fix from #1076

WARNING: this need to be accepted with #1120 because of that there will be a NPC missing =P