Minor tweaks... nothing significant
Tweaked the handling of Waveforms