Added pins to the map, changed error wordings