make all calibration tools MT compliant, use them and update references

make all calibration tools MT compliant, use them and update references. Including also @dbakshig , who helped me see that this was an issue...