Update CB sample for bug fixes and stuff from last commit