Improved genotype harmonizer, fix trityper bug