normalization changes, regex adjustments