diff --git a/decodedtext.cpp b/decodedtext.cpp
index 265b8ffaf..25d5c3d07 100644
--- a/decodedtext.cpp
+++ b/decodedtext.cpp
@@ -165,6 +165,12 @@ void DecodedText::deCallAndGrid(/*out*/QString& call, QString& grid) const
   call = match.captured ("word2");
   grid = match.captured ("word3");
   if ("R" == grid) grid = match.captured ("word4");
+  if(match.captured("word1")=="CQ" and call.length()>=3 and call.length()<=4
+     and !call.contains(QRegExp("0-9"))) {
+    //Second word has length 3 or 4 and contains no digits
+    call = match.captured ("word3");
+    grid = match.captured ("word4");
+  }
 }
 
 unsigned DecodedText::timeInSeconds() const
diff --git a/displaytext.cpp b/displaytext.cpp
index 1e661a92f..899750ff1 100644
--- a/displaytext.cpp
+++ b/displaytext.cpp
@@ -178,7 +178,6 @@ QString DisplayText::appendWorkedB4(QString message, QString const& callsign, QS
   logBook.match(/*in*/call,grid,/*out*/countryName,callWorkedBefore,countryWorkedBefore,gridB4);
   logBook.match(/*in*/call,grid,/*out*/countryName,callB4onBand,countryB4onBand,gridB4onBand,
                 /*in*/ currentBand);
-//  if(gridB4) qDebug() << "aa" << grid << gridB4 << gridB4onBand;
 
   message = message.trimmed ();
   QString appendage{""};
diff --git a/lib/77bit/wsjt-x_v2.0.txt b/lib/77bit/wsjt-x_v2.0.txt
index 107a93b90..59464dae0 100644
--- a/lib/77bit/wsjt-x_v2.0.txt
+++ b/lib/77bit/wsjt-x_v2.0.txt
@@ -155,7 +155,8 @@ CQ TEST G4ABC/P IO91
                                    G4ABC/P PA9XYZ JO22
 PA9XYZ 590003 IO91NP
                                    G4ABC/P R 570007 JO22DB
-PA9XYZ G4ABC/P RR73
+PA9XYZ G4ABC/P RRR
+                                   G4ABC/P PA9XYZ 73
 
 ----------------------------------------------------------------------------------
 8. Compound call
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 496c31b76..e8d2a3163 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -3035,12 +3035,6 @@ void MainWindow::readFromStdout()                             //readFromStdout
         QString deCall;
         QString grid;
         decodedtext.deCallAndGrid(/*out*/deCall,grid);
-/*
-        qDebug() << "Worked" << deCall << grid << m_callWorked[deCall] << m_gridWorked[grid]
-                    << isWorked(int(CALL),deCall,float(m_freqNominal/1000000.0))
-                    << isWorked(int(CALL),deCall)
-                    << isWorked(int(GRID),grid);
-*/
         {
           QString t=Radio::base_callsign(ui->dxCallEntry->text());
           if((t==deCall or t=="") and rpt!="") m_rptRcvd=rpt;
@@ -4106,7 +4100,7 @@ void MainWindow::doubleClickOnCall(Qt::KeyboardModifiers modifiers)
   QTextCursor cursor;
   if(m_mode=="ISCAT") {
     MessageBox::information_message (this,
-        "Double-click not presently implemented for ISCAT mode");
+        "Double-click not available for ISCAT mode");
   }
   if(m_decodedText2) {
     cursor=ui->decodedTextBrowser->textCursor();
@@ -4624,10 +4618,7 @@ void MainWindow::genStdMsgs(QString rpt, bool unconditional)
     ui->tx2->clear ();
     ui->tx3->clear ();
     ui->tx4->clear ();
-    if (unconditional) {        // leave in place in case it needs
-                                // sending again
-      ui->tx5->lineEdit ()->clear ();
-    }
+    if(unconditional) ui->tx5->lineEdit ()->clear ();   //Test if it needs sending again
     ui->genMsg->clear ();
     m_gen_message_is_cq = false;
     return;
@@ -4675,7 +4666,6 @@ void MainWindow::genStdMsgs(QString rpt, bool unconditional)
         msgtype(t, ui->tx2);
         t=t0 + "R " + m_config.FieldDayExchange();
         msgtype(t, ui->tx3);
-        m_send_RR73=true;
       }
 
       QString rst;
@@ -4694,7 +4684,6 @@ void MainWindow::genStdMsgs(QString rpt, bool unconditional)
         msgtype(t, ui->tx2);
         t=t0 + "R " + rst + t1;
         msgtype(t, ui->tx3);
-        m_send_RR73=true;
       }
 
       QString rs=rst.mid(0,2);
@@ -4707,7 +4696,6 @@ void MainWindow::genStdMsgs(QString rpt, bool unconditional)
         a.sprintf("%4.4d ",ui->sbSerialNumber->value());
         t=t1 + " R " + rs + a + m_config.my_grid();
         msgtype(t, ui->tx3);
-        m_send_RR73=true;
       }
     }
     if(m_mode=="MSK144" and m_bShMsgs) {
@@ -5163,7 +5151,6 @@ void MainWindow::cabLog()
     if(m_freqNominal>50000000) nfreq=m_freqNominal/1000000;
     QString t;
     t.sprintf("QSO: %5d RY ",nfreq);
-    qDebug() << t;
     t=t + QDateTime::currentDateTimeUtc().toString("yyyy-MM-dd hhmm ") +
         m_config.my_callsign().leftJustified(13,' ') + m_xSent.leftJustified(14,' ') +
         m_hisCall.leftJustified(13,' ') + m_xRcvd;