Updated the TODO and CHANGELOG