More bug fixes, now scales the y waveform.