Various updates to the cbc and atoms