Updated TODOS with more descriptions.