Incidence reanalysis

Reanalysis of incidence patterns on a per-lineage basis. Fix #1.  Fix #2.