A start on v.16
Fixed problems in forecasting cohort life expectancy