Combine additional functions for infection and recover, discrete and continuous, SI and SIR
minor cleanup