2nd draft of the Epi model, more diagnostics added