normalization changes and fixes