Fixed TODO and CHANGELOG