Some few changes to the map and script