Various changes to fix bugs with running a single phenotype.