Some fixes (replacements todo -> delegator)