Updated TODO file and ChangeLog