Added some to-do comments.