Updated Changelog and todo