TODO and CHANGELOG updates