Updated TODO's.