Updated TODO, added some comments.