make calib & recalib consistent ... and working again