further todo changes