some todo changes