Update TODO's