Added functionality to accept normalization constants. Fixed other normalization related bugs.