Bug hotfix
Table Generation and problems with moving over to $current_cohort, fixed.