diff --git a/lib/decoder.f90 b/lib/decoder.f90
index 5c40086f9..7fdc1bd02 100644
--- a/lib/decoder.f90
+++ b/lib/decoder.f90
@@ -51,8 +51,10 @@ subroutine decoder(ntrSeconds,c0)
   rewind 13
 !  write(*,1010) nutc,sync,xdt,1000.0+fpk,msg
   nsync=sync
-  write(13,1010) nutc,nsync,snr,xdt,1000.0+fpk,msg
-1010 format(i4.4,i4,f7.1,f6.1,f8.1,3x,a22,e12.3)
+  nsnr=nint(snr)
+  width=0.0
+  write(13,1010) nutc,nsync,nsnr,xdt,1000.0+fpk,width,msg
+1010 format(i4.4,i4,i5,f6.1,f8.2,f6.2,3x,a22)
   call flush(13)
   close(13)
 
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 0b13ad986..4cb8558ae 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1095,16 +1095,23 @@ void MainWindow::doubleClickOnCall(QString hiscall, bool ctrl)
   ui->dxCallEntry->setText(hiscall);
   QString t = ui->decodedTextBrowser->toPlainText();   //Full contents
   int i2=ui->decodedTextBrowser->textCursor().position();
-  QString t1 = t.mid(0,i2);              //contents up to text cursor
-  int i1=t1.lastIndexOf("\n") + 1;
-  QString t2 = t1.mid(i1,i2-i1);         //selected line
-  int n = 60*t2.mid(13,2).toInt() + t2.mid(15,2).toInt();
-  m_txFirst = ((n%2) == 1);
+  int i3=t.mid(i2,99).indexOf("\n")-1;   //points to last char of line
+  QString t1 = t.mid(0,i3);              //contents up to \n on selected line
+  int i1=t1.lastIndexOf("\n") + 1;       //points to first char of line
+  QString t2 = t1.mid(i1,i3-i1);         //selected line
+  int n = 60*t2.mid(0,2).toInt() + t2.mid(2,2).toInt();
+  int nmod=n%(m_TRperiod/30);
+  m_txFirst=(nmod!=0);
   ui->txFirstCheckBox->setChecked(m_txFirst);
-  QString rpt="";
-  if(ctrl) rpt=t2.mid(23,3);
-  lookup();
-  rpt="-30";
+  qDebug() << t2.mid(0,2) << t2.mid(2,2) << n << nmod << m_txFirst;
+  QString rpt=t2.mid(10,3);
+  if(ctrl) {
+    int i4=t.mid(i2,20).indexOf(" ");
+    QString hisgrid=t.mid(i2,20).mid(i4+1,4);
+    ui->dxGridEntry->setText(hisgrid);
+  } else {
+    lookup();
+  }
   genStdMsgs(rpt);
   if(t2.indexOf(m_myCall)>0) {
     m_ntx=2;
diff --git a/mainwindow.ui b/mainwindow.ui
index a029fe490..a9d938954 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -66,7 +66,7 @@
         </size>
        </property>
        <property name="title">
-        <string>     UTC      Sync         dB             DT            Freq</string>
+        <string>     UTC      Sync       dB            DT          Freq          Width</string>
        </property>
        <layout class="QVBoxLayout" name="verticalLayout_9">
         <item>