Add markers for placs, add labels for places, tweak positioning of place labels so they all fit nicely.