diff --git a/lib/qra64a.f90 b/lib/qra64a.f90
index 12198ad44..f880b6ab0 100644
--- a/lib/qra64a.f90
+++ b/lib/qra64a.f90
@@ -84,50 +84,50 @@ subroutine qra64a(dd,npts,nf1,nf2,nfqso,ntol,mode64,minsync,ndepth,   &
   ncall=0
 
   do idf0=1,11
-  idf=idf0/2
-  if(mod(idf0,2).eq.0) idf=-idf
+     idf=idf0/2
+     if(mod(idf0,2).eq.0) idf=-idf
   
-  a=0.
-  a(1)=-(f0+0.868*idf)
-  call twkfreq(c00,c0,npts2,6000.0,a)
+     a=0.
+     a(1)=-(f0+0.868*idf)
+     call twkfreq(c00,c0,npts2,6000.0,a)
 
-  do idt0=1,idtmax
-     idt=idt0/2
-     if(mod(idt0,2).eq.0) idt=-idt
-     jpk=jpk0 + 750*idt
-     call spec64(c0,jpk,s3a,LL,NN)
-     call pctile(s3a,LL*NN,40,base)
-     s3a=s3a/base
-     where(s3a(1:LL*NN)>s3lim) s3a(1:LL*NN)=s3lim
-     do ibw=ibwmax,ibwmin,-2
-        b90=1.728**ibw
-        if(b90.gt.230.0) cycle
-        if(b90.lt.0.15*width) exit
-        s3(1:LL*NN)=s3a(1:LL*NN)
-        ncall=ncall+1
-        call timer('qra64_de',0)
-        call qra64_dec(s3,nc1,nc2,ng2,naptype,0,nSubmode,b90,      &
-             nFadingModel,dat4,snr2,irc)
-        call timer('qra64_de',1)
-        if(irc.eq.0) go to 10
-        if(irc.gt.0) call badmsg(irc,dat4,nc1,nc2,ng2)
-        iirc=max(0,min(irc,11))
-        if(irc.gt.0 .and. nap(iirc).lt.napmin) then
-           dat4x=dat4
-           b90x=b90
-           snr2x=snr2
-           napmin=nap(iirc)
-           irckeep=irc
-           dtxkeep=jpk/6000.0 - 1.0
-           f0keep=-a(1)
-           idfkeep=idf
-           idtkeep=idt
-           ibwkeep=ibw
-        endif
-     enddo
-     if(iand(ndepth,3).lt.3 .and. irc.ge.0) go to 100
-     if(irc.eq.0) go to 100
-  enddo  ! idt (DT loop)
+     do idt0=1,idtmax
+        idt=idt0/2
+        if(mod(idt0,2).eq.0) idt=-idt
+        jpk=jpk0 + 750*idt
+        call spec64(c0,jpk,s3a,LL,NN)
+        call pctile(s3a,LL*NN,40,base)
+        s3a=s3a/base
+        where(s3a(1:LL*NN)>s3lim) s3a(1:LL*NN)=s3lim
+        do ibw=ibwmax,ibwmin,-2
+           b90=1.728**ibw
+           if(b90.gt.230.0) cycle
+           if(b90.lt.0.15*width) exit
+           s3(1:LL*NN)=s3a(1:LL*NN)
+           ncall=ncall+1
+           call timer('qra64_de',0)
+           call qra64_dec(s3,nc1,nc2,ng2,naptype,0,nSubmode,b90,      &
+                nFadingModel,dat4,snr2,irc)
+           call timer('qra64_de',1)
+           if(irc.eq.0) go to 10
+           if(irc.gt.0) call badmsg(irc,dat4,nc1,nc2,ng2)
+           iirc=max(0,min(irc,11))
+           if(irc.gt.0 .and. nap(iirc).lt.napmin) then
+              dat4x=dat4
+              b90x=b90
+              snr2x=snr2
+              napmin=nap(iirc)
+              irckeep=irc
+              dtxkeep=jpk/6000.0 - 1.0
+              f0keep=-a(1)
+              idfkeep=idf
+              idtkeep=idt
+              ibwkeep=ibw
+           endif
+        enddo  ! ibw (b90 loop)
+        if(iand(ndepth,3).lt.3 .and. irc.ge.0) go to 100
+        if(irc.eq.0) go to 100
+     enddo  ! idt (DT loop)
   enddo  ! idf (f0 loop)
 
 100 if(napmin.ne.99) then
diff --git a/lib/test_qra64.f90 b/lib/test_qra64.f90
index f816244a3..760c87452 100644
--- a/lib/test_qra64.f90
+++ b/lib/test_qra64.f90
@@ -96,10 +96,8 @@ program test_qra64
            i=irc
            if(i.le.11) then
               ndecodes=ndecodes + 1
-              navg=navg + 1
            else
               i=mod(i,10)
-              navg=navg + 1
            endif
            nretcode(i)=nretcode(i) + 1
         else
diff --git a/lib/test_qra65.f90 b/lib/test_qra65.f90
index 30e2c0d9f..76056cef8 100644
--- a/lib/test_qra65.f90
+++ b/lib/test_qra65.f90
@@ -80,8 +80,9 @@ program test_qra65
   write(12,1000) (j,j=0,11)
 1000 format(/'SNR d  Dop Sync Dec1 DecN Bad',i6,11i4,'  tdec dtavg dtrms'/97('-'))
 
-  dterr=3.0*tsym/4.0
-  nferr=max(1,nint(0.5*baud))
+  dterr=tsym/4.0
+  nferr=max(1,nint(0.5*baud),nint(fdop/3.0))
+  ndecodes0=nfiles
   
   do nsnr=ia,ib,-1
      nsync=0
@@ -89,8 +90,6 @@ program test_qra65
      nfalse=0
      nretcode=0
      navg=0
-     sumxdt=0.
-     sqxdt=0.
      write(cmd1(61:63),'(i3)') nsnr
      call system(cmd1)
      call sec0(0,tdec)
@@ -100,19 +99,20 @@ program test_qra65
      n=0
      do iline=1,9999
         read(10,'(a71)',end=10) line
-        if(len(trim(line)).lt.60) cycle
+        if(index(line,'<Decode').eq.1) cycle
         read(line(11:20),*) xdt,nf
-!        if(ntrperiod.eq.60) xdt=xdt-0.5              !### TEMPORARY ###
-        if(abs(xdt-dt).le.dterr .and. abs(nf-nf0).le.nferr) nsync=nsync+1
-        read(line(60:),*) irc,iavg
-        if(irc.lt.0) cycle
+        if(ntrperiod.ge.60) xdt=xdt-0.5              !### TEMPORARY ###
         decok=index(line,'W9XYZ').gt.0
+        if((abs(xdt-dt).le.dterr .and. abs(nf-nf0).le.nferr) .or. decok) then
+           nsync=nsync+1
+        endif
+        irc=-1
+        if(line(23:23).ne.' ') read(line(60:),*) irc,iavg
+        if(irc.lt.0) cycle
         if(decok) then
            i=irc
            if(i.le.11) then
               ndecodes=ndecodes + 1
-              sumxdt=sumxdt + xdt
-              sqxdt=sqxdt + xdt*xdt
               navg=navg + 1
            else
               i=mod(i,10)
@@ -127,18 +127,21 @@ program test_qra65
 10   close(10)
      xdt_avg=0.
      xdt_rms=0.
-     if(ndecodes.ge.2) then
-        xdt_avg=sumxdt/ndecodes
-        xdt_rms=sqxdt/(ndecodes-1) - xdt_avg*xdt_avg
-     endif
      write(*,1100) nsnr,ndepth,fDop,nsync,ndecodes,navg,nfalse,nretcode,   &
-          tdec/nfiles,xdt_avg,xdt_rms
+          tdec/nfiles
      write(12,1100) nsnr,ndepth,fDop,nsync,ndecodes,navg,nfalse,nretcode,  &
-          tdec/nfiles,xdt_avg,xdt_rms
-1100 format(i3,i2,f5.1,3i5,i4,i6,11i4,3f6.2)
+          tdec/nfiles
+1100 format(i3,i2,f5.1,3i5,i4,i6,11i4,f6.2)
+     if(ndecodes.lt.nfiles/2 .and. ndecodes0.ge.nfiles/2) then
+        snr_thresh=nsnr + float(nfiles/2 - ndecodes)/(ndecodes0-ndecodes)
+        write(13,1200) ndepth,fdop,csubmode,snr_thresh
+1200    format(i1,f6.1,2x,a1,f7.1)
+        flush(13)
+     endif
      flush(6)
      flush(12)
-  enddo
+     ndecodes0=ndecodes
+  enddo  ! nsnr
 
 999 end program test_qra65