Added waveform peak 2 peak as a feature in the cluster analysis. Major improvement.