cleaner epi curves and fits to weekly incidence

But issues with 2014. Need to revise generation times...