CHANGES and TODO for 2.1