a few todo changes