Calibration debug/optimization and update of the TODO lists