small things, some more normalization