Added changelog and changed TODO