final changes to IbwCalculator, except perhaps make ABW correction factor a setting