corrected TODO to reflect things done