diff --git a/mainwindow.cpp b/mainwindow.cpp
index c75e4b7f9..bf3ff9c6b 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1420,7 +1420,11 @@ void MainWindow::on_actionSettings_triggered()               //Setup Dialog
     bool vhf {m_config.enable_VHF_features ()};
     if (!vhf) {
       ui->sbSubmode->setValue (0);
-      if(m_mode=="JT9") ui->sbSubmode->setVisible(false);
+      if(m_mode=="JT4" or m_mode=="JT9" or m_mode=="JT65") {
+        ui->sbSubmode->setVisible(false);
+        ui->sbFtol->setVisible(false);
+        ui->syncSpinBox->setVisible(false);
+      }
     }
     setup_status_bar (vhf);
     bool b = vhf && (m_mode=="JT4" or m_mode=="JT65" or m_mode=="ISCAT" or
@@ -1429,7 +1433,10 @@ void MainWindow::on_actionSettings_triggered()               //Setup Dialog
       VHF_features_enabled(b);
       VHF_controls_visible(b);
     }
-    if(m_mode=="MSK144" or (m_mode=="JT9" and m_nSubMode<4)) ui->cbFast9->setVisible(false);
+    if(m_mode=="JT4" or (m_mode=="JT9" and m_nSubMode<4) or m_mode=="JT65" or
+       m_mode=="JT9+JT65" or m_mode=="ISCAT" or m_mode=="MSK144") {
+      ui->cbFast9->setVisible(false);
+    }
   }
 
   m_config.transceiver_online ();
diff --git a/mainwindow.ui b/mainwindow.ui
index 0a6937e7e..aa7ed6197 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -2765,7 +2765,7 @@ QPushButton[state=&quot;ok&quot;] {
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>WSPR-2</string>
+    <string>WSPR</string>
    </property>
   </action>
   <action name="actionWSPR_15">
diff --git a/widegraph.cpp b/widegraph.cpp
index c32d2f0e5..f4f21adc7 100644
--- a/widegraph.cpp
+++ b/widegraph.cpp
@@ -149,7 +149,7 @@ void WideGraph::dataSink2(float s[], float df3, int ihsym, int ndiskdata)  //dat
   static float splot[NSMAX];
   int nbpp = ui->widePlot->binsPerPixel();
 
-  //Average spectra over specified number, m_waterfallAvg
+//Average spectra over specified number, m_waterfallAvg
   if (m_n==0) {
     for (int i=0; i<NSMAX; i++)
       splot[i]=s[i];
@@ -167,11 +167,12 @@ void WideGraph::dataSink2(float s[], float df3, int ihsym, int ndiskdata)  //dat
     int jz=5000.0/(nbpp*df3);
 		if(jz>MAX_SCREENSIZE) jz=MAX_SCREENSIZE;
     for (int j=0; j<jz; j++) {
-      float sum=0;
+      float ss=0;
       for (int k=0; k<nbpp; k++) {
-        sum += splot[i++];
+        if(splot[i]>ss) ss=splot[i];
+        i++;
       }
-      swide[j]=sum;
+      swide[j]=nbpp*ss;
     }
 
 // Time according to this computer