improve range and normalization handling