diff --git a/lib/decode65a.f90 b/lib/decode65a.f90
index 777031e69..b307bc330 100644
--- a/lib/decode65a.f90
+++ b/lib/decode65a.f90
@@ -93,6 +93,7 @@ subroutine decode65a(dd,npts,newdat,nqd,f0,nflip,mode65,ntrials,     &
 
   call timer('dec65b  ',0)
   qualbest=0.
+  nftbest=0
   qual0=-1.e30
   minsmo=0
   maxsmo=0
@@ -126,7 +127,6 @@ subroutine decode65a(dd,npts,newdat,nqd,f0,nflip,mode65,ntrials,     &
      call decode65b(s2,nflip,nadd,mode65,ntrials,naggressive,ndepth,        &
           mycall,hiscall,hisgrid,nQSOProgress,ljt65apon,nqd,nft,qual,       &
           nhist,decoded)
-
      if(nft.eq.1) then
         nsmo=ismo
         param(9)=nsmo
@@ -138,13 +138,14 @@ subroutine decode65a(dd,npts,newdat,nqd,f0,nflip,mode65,ntrials,     &
            qualbest=qual
            nnbest=nn
            nsmobest=ismo
+           nftbest=nft
         endif
      endif
      if(qual.lt.qual0) exit
      qual0=qual
   enddo
 
-  if(nft.eq.2) then
+  if(nftbest.eq.2) then
      decoded=decoded_best
      qual=qualbest
      nsmo=nsmobest
diff --git a/lib/decode65b.f90 b/lib/decode65b.f90
index 2be808145..0ff169bc7 100644
--- a/lib/decode65b.f90
+++ b/lib/decode65b.f90
@@ -21,7 +21,7 @@ subroutine decode65b(s2,nflip,nadd,mode65,ntrials,naggressive,ndepth,      &
 
   call extract(s3,nadd,mode65,ntrials,naggressive,ndepth,nflip,mycall,   &
       hiscall,hisgrid,nQSOProgress,ljt65apon,ncount,                     &
-      nhist,decoded,ltext,nft,qual) 
+      nhist,decoded,ltext,nft,qual)
 
 ! Suppress "birdie messages" and other garbage decodes:
   if(decoded(1:7).eq.'000AAA ') ncount=-1
diff --git a/lib/jt65_decode.f90 b/lib/jt65_decode.f90
index 1e87c03a5..fb21fc34e 100644
--- a/lib/jt65_decode.f90
+++ b/lib/jt65_decode.f90
@@ -386,7 +386,6 @@ contains
 ! Silence compiler warnings
        if(nagain .and. ndeepave.eq.-99 .and. neme.eq.-99) stop
        first=.false.
-!       print*,'Clear avg',nutc
     endif
 
     do i=1,64
@@ -402,7 +401,6 @@ contains
     nflipsave(nsave)=nflip
     s1save(-255:256,1:126,nsave)=s1
     s3save(1:64,1:63,nsave)=s3a
-!    print*,'nsave:',nsave
     
 10  syncsum=0.
     dtsum=0.