Changed comment, added more TODO's