CFC docs, some maintenance work