Updated the change log and the todo