minor fixes CalculationModel