Updates ChangeLog
Adds more code cleanup TODOs