Normalization & some bugs