ChangeLog and TODO update