Fix

Complete changes to various Forethought files.