more waveform drawing/coloring changes