TODO and CHANGELOG revised.