Normalization of waveforms is now fixed.