CHANGES and TODO update