Updated map/current location with Victor's changes and cleaned it up