Update changelog and todo