Updated Changelog a bit and added to the TODO.txt