Updated some TODO comments.