Updated TODO section.