Improve skipping, waveform styling