Updated change log and TODO