Added waveform dump (always on)
Updated clean accordingly