Added some accors to clean things up
Making cohort reports a little more flexible