add CCD (and a few other terms). re #32