some further todo changes.