better markers, added clustering