diff --git a/audio_sink/src/main.cpp b/audio_sink/src/main.cpp
index dd05a4c6..319cb0ac 100644
--- a/audio_sink/src/main.cpp
+++ b/audio_sink/src/main.cpp
@@ -142,7 +142,7 @@ private:
         PaError err;
 
         float sampleRate = dev->sampleRates[dev->srId];
-        int bufferSize = sampleRate / 60.0f;
+        int bufferSize = sampleRate / 200.0f;
 
         if (dev->channels == 2) {
             stereoRB.data.setMaxLatency(bufferSize * 2);
diff --git a/core/src/gui/main_window.cpp b/core/src/gui/main_window.cpp
index cdc7d262..397ce562 100644
--- a/core/src/gui/main_window.cpp
+++ b/core/src/gui/main_window.cpp
@@ -125,7 +125,6 @@ void windowInit() {
     // Add "select folder" option for the file source
     // Fix SSB demod
     // FIX AUDIO ISSUE ON BOTH LINUX AND SOMETIMES WINDOWS (probly the ring buffer, though double buffering could help)
-    // Add CW mode to radio module
     // Add default main config to avoid having to ship one
     // Have a good directory system on both linux and windows
     // Switch to double buffering
diff --git a/radio/src/main.cpp b/radio/src/main.cpp
index 8f4b8b3f..d27fc4d0 100644
--- a/radio/src/main.cpp
+++ b/radio/src/main.cpp
@@ -123,6 +123,7 @@ private:
         currentDemod->setAudioSampleRate(audioSampRate);
         stream.setInput(currentDemod->getOutput());
         currentDemod->select();
+        vfo->output->flush();
         currentDemod->start();
     }
 
diff --git a/root_dev/config.json b/root_dev/config.json
index afa4ed5e..5663b1af 100644
--- a/root_dev/config.json
+++ b/root_dev/config.json
@@ -19,7 +19,7 @@
     "bandPlan": "General",
     "bandPlanEnabled": true,
     "fftHeight": 296,
-    "frequency": 98930000,
+    "frequency": 98672900,
     "max": 0.0,
     "maximized": false,
     "menuOrder": [
@@ -42,7 +42,7 @@
         "Radio": {
             "muted": false,
             "sink": "Audio",
-            "volume": 0.4183673560619354
+            "volume": 0.6858407258987427
         },
         "Radio 1": {
             "muted": true,
diff --git a/root_dev/soapy_source_config.json b/root_dev/soapy_source_config.json
index 9350ecda..e1191d56 100644
--- a/root_dev/soapy_source_config.json
+++ b/root_dev/soapy_source_config.json
@@ -32,7 +32,7 @@
                 "LNA": 23.415000915527344,
                 "VGA": 16.332000732421875
             },
-            "sampleRate": 2000000.0
+            "sampleRate": 8000000.0
         },
         "Microphone (Realtek High Definition Audio)": {
             "sampleRate": 96000.0