a few small changes to normalization to support and.