Adding latest and greatest stu fixes to CBS