improved map; added clustering