better clustering algo
finished clustering, lots of other changes
rename