fix crystallization bug and fitter bug