Updates to changelog and TODO