small fixes + adding calibration and digi classes