Needs to be done
================

Tidy up code a bit
Sort out the waveforms so they don't need the level fudge
Get better patches

