cleaning calibration and adding user tacking