added naive handling of TB death, self-cure, and treatment effect