Improved waveform script, updated waveforms