Updated CHANGES and TODO to reflect recent changes.