todo changes, some cleanup