Calibration enhancements

I've added it at the end of the struc definition, I can move it also in the initialisation.