Fixed + Improved Adaptive Comfort Calculator