moved some stuff out of cadf_iters.h to more logical places