Fix the normalization bug in QoS modeling, also made various upgrades.

ref: T6
type: consolidation/testing/fix