Adjustments to friends of c&d (closes #30)