Fix #24 : Finish up work with waveform-rendering