Improved calibration proces

Better calibration and a lot of azer staf