Diversity estimates refactoring & fixes