Adjusted some of the map parsing stuff