add estimation of number of haplotypes present; extensive internal refactoring