got calibration at least partiall working
merge commit