Add results clustering
Change entropy calculation