added smoothing options for calibration data
some minor cleanup