Removed old stuff from TODO, put draft of 2.0.4 changes in CHANGES (Stephen Watson)