todos and rejig change log