Update TODO and CHANGELOG