Some waveshaper improvements