diff --git a/q65w/libm65/m65c.f90 b/q65w/libm65/m65c.f90
index 558a9d8ae..7853ec507 100644
--- a/q65w/libm65/m65c.f90
+++ b/q65w/libm65/m65c.f90
@@ -16,30 +16,31 @@ subroutine m65c(itimer)
   character*12 mycall,hiscall
   character*6 mygrid,hisgrid
   character*20 datetime
-  character*80 cwd
 
   common/datcom2/dd(4,5760000),ss(4,322,NFFT),savg(4,NFFT),nparams0
+
+!### REMEMBER that /npar/ is not updated until nparams=nparams0 is executed. ###
   common/npar/fcenter,nutc,idphi,mousedf,mousefqso,nagain,                &
        ndepth,ndiskdat,neme,newdat,nfa,nfb,nfcal,nfshift,                 &
        mcall3,nkeep,ntol,nxant,nrxlog,nfsample,nxpol,nmode,               &
        ndop00,nsave,max_drift,nhsym,mycall,mygrid,hiscall,hisgrid,        &
        datetime,junk1,junk2
+!### REMEMBER that /npar/ is not updated until nparams=nparams0 is executed. ###
+
   common/early/nhsym1,nhsym2,ldecoded(32768)
   equivalence (nparams,fcenter)
   data first/.true./
-  save first,cwd
+  save first
 
+  nparams=nparams0                     !Copy parameters into common/npar/
   if(itimer.ne.0) then
-!     call timer('q65w    ',1)
-!     call timer('q65w    ',101)
      call timer('decode0 ',101)
      call fini_timer
      return
   endif
-  
+
   lq65w=.true.
   lq65w2=.true.
-  nparams=nparams0                     !Copy parameters into common/npar/
   datetime(18:20)=':00'
 
 !  if(first) call timer('q65w    ',0)
diff --git a/q65w/mainwindow.cpp b/q65w/mainwindow.cpp
index 808ab64c8..fdd0b0bad 100644
--- a/q65w/mainwindow.cpp
+++ b/q65w/mainwindow.cpp
@@ -289,7 +289,7 @@ void MainWindow::readSettings()
   ui->actionNone->setChecked(settings.value("SaveNone",true).toBool());
   ui->actionSave_all->setChecked(settings.value("SaveAll",false).toBool());
   m_saveAll=ui->actionSave_all->isChecked();
-  m_ndepth=settings.value("NDepth",0).toInt();
+  m_ndepth=settings.value("NDepth",2).toInt();
   m_onlyEME=settings.value("NEME",false).toBool();
   ui->actionOnly_EME_calls->setChecked(m_onlyEME);
   m_kb8rq=settings.value("KB8RQ",false).toBool();
@@ -766,17 +766,17 @@ void MainWindow::on_actionDelete_all_tf2_files_in_SaveDir_triggered()
   }
 }
 
-void MainWindow::on_actionNo_Deep_Search_triggered()          //No Deep Search
+void MainWindow::on_actionNo_Deep_Search_triggered()
 {
   m_ndepth=0;
 }
 
-void MainWindow::on_actionNormal_Deep_Search_triggered()      //Normal DS
+void MainWindow::on_actionNormal_Deep_Search_triggered()
 {
   m_ndepth=1;
 }
 
-void MainWindow::on_actionAggressive_Deep_Search_triggered()  //Aggressive DS
+void MainWindow::on_actionAggressive_Deep_Search_triggered()
 {
   m_ndepth=2;
 }
@@ -875,7 +875,7 @@ void MainWindow::decode()                                       //decode()
   datcom_.ntol=m_tol;
   datcom_.nxant=0;
   m_nutc0=datcom_.nutc;
-  datcom_.map65RxLog=0;
+  datcom_.junk_1=0;
   datcom_.nfsample=96000;
   if(!m_fs96000) datcom_.nfsample=95238;
   datcom_.nxpol=0;
diff --git a/q65w/mainwindow.ui b/q65w/mainwindow.ui
index ab6328264..1c9b5d9ed 100644
--- a/q65w/mainwindow.ui
+++ b/q65w/mainwindow.ui
@@ -823,18 +823,21 @@ p, li { white-space: pre-wrap; }
     <bool>true</bool>
    </property>
    <property name="checked">
-    <bool>true</bool>
+    <bool>false</bool>
    </property>
    <property name="text">
-    <string>No Deep Search</string>
+    <string>Fast</string>
    </property>
   </action>
   <action name="actionNormal_Deep_Search">
    <property name="checkable">
     <bool>true</bool>
    </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
    <property name="text">
-    <string>Normal Deep Search</string>
+    <string>Normal</string>
    </property>
   </action>
   <action name="actionAggressive_Deep_Search">
@@ -842,7 +845,7 @@ p, li { white-space: pre-wrap; }
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Aggressive Deep Search</string>
+    <string>Deep</string>
    </property>
   </action>
   <action name="actionNone">