fixed ShowAverageWaveform & a few other MClust issues