expanded possibilities for calibration
updates of Tao's tutorials