more normalization changes. need to write unit tests