Wards clustering added and fixed