added diversity and entropy calculations