ChangeLog and TODO updates

Changed up ChangeLog and updated TODO list