update changelog and TODO