changes to ChangeLog and TODO