updated changelog and todo