Fix pointer display and improove waveform