Some Fixing mainly in Assessments