Found a mistake or two, added the waveforms...