Cleanup, add tolerance to CCT calc.