Fixed some normalization stuff