Added notion of Normality.
Fixed some bugs