Updated TODO comments.