Changelog and TODO updated