diff --git a/docs/changelog.md b/docs/changelog.md
index 021d8b14..1eed86e4 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -1,5 +1,23 @@
 # Surge XT VCV Modules Changelog
 
+## 2.1.4 (Coming March 2023)
+
+- EGxVCA: Pan Law is now an option of either the MixMaster
+Stereo Equal Power or True Panning. Stereo Equal Power is
+the new default, matching MixMaster. *This will change the
+behavior of EGxVCA pan in saved patches unless you explicitly
+restore the True Panning mode in the menu*.
+- Mixer, TunedDelays: Left/Mono normalize properly.
+- Mixer: Turn of the 'unmute-on-connect' mixer behavior when unstreaming, allowing
+mute to save correctly
+- Twist: Don't paint the Twist waveform with the LPG on
+- LFOxEG: Imporove wording on "Set EG to Zero" on LFO
+- LFOxEG: Paint the raw wave as a 'ghost' wave in the LFO display
+- LFOxEG: Adjust the Phase/Shuffle label on the LFO front pane
+- WaveTable/Window: Fix several problems with loading incomplete wavetables and
+painting the resulting wavetable display.
+- Infrastructure: Make Surge's use of SIMDE compile time selectable; use rack SIMDE
+
 ## 2.1.3
 
 - Fix for wavetable 3d position display when modulating Morph parameter
diff --git a/src/VCO.cpp b/src/VCO.cpp
index cdfba6e9..f25a20c4 100644
--- a/src/VCO.cpp
+++ b/src/VCO.cpp
@@ -480,6 +480,9 @@ struct OSCPlotWidget : public rack::widget::TransparentWidget, style::StyleParti
         {
             recalcPath();
             bdwPlot->dirty = true;
+            // Oh dirty can also change the background not just the plot
+            // if features like oneshot changes
+            bdw->dirty = true;
         }
 
         if constexpr (VCOConfig<oscType>::requiresWavetables())
@@ -648,8 +651,11 @@ struct OSCPlotWidget : public rack::widget::TransparentWidget, style::StyleParti
 
         if (VCOConfig<oscType>::requiresWavetables())
         {
-            if (module->wavetableCount == 0)
+            if (module && module->wavetableCount == 0)
                 return;
+
+            if (module)
+                isOneShot = module->isWTOneShot();
         }
 
         if (module && module->draw3DWavetable)
diff --git a/surge b/surge
index f5b9c051..a1601da4 160000
--- a/surge
+++ b/surge
@@ -1 +1 @@
-Subproject commit f5b9c051952b7cfbab66ba5009b13c5f146aef12
+Subproject commit a1601da407db331a39b337b213ed0a66e196262c