moved to dynamical calibration

minor fixes