diff --git a/lib/q65_decode.f90 b/lib/q65_decode.f90
index ae878679e..94ca0fff4 100644
--- a/lib/q65_decode.f90
+++ b/lib/q65_decode.f90
@@ -138,11 +138,10 @@ contains
     if(irc.ge.0) then
 !###
        navg=irc/100
-       irc=ipass
+       irc=100*navg + ipass
 !###
        write(c77,1000) dat4
 1000   format(12b6.6,b5.5)
-
        call unpack77(c77,0,decoded,unpk77_success) !Unpack to get msgsent
        nsnr=nint(snr2)
        call this%callback(nutc,sync,nsnr,xdt,f0,decoded,              &
diff --git a/lib/qra/q65/q65_loops.f90 b/lib/qra/q65/q65_loops.f90
index eacd99549..0460fb621 100644
--- a/lib/qra/q65/q65_loops.f90
+++ b/lib/qra/q65/q65_loops.f90
@@ -47,7 +47,7 @@ subroutine q65_loops(c00,npts2,nsps,mode,mode64,nsubmode,nFadingModel,   &
         call twkfreq(c00,c0,npts2,6000.0,a)
         do idt=1,idtmax
            ndt=idt/2
-           if(iavg.eq.0) then
+           if(ipass.eq.0 .and. iavg.eq.0) then
               if(mod(idt,2).eq.0) ndt=-ndt
               jpk=jpk0 + nsps*ndt/16              !tsym/16
               if(jpk.lt.0) jpk=0
@@ -57,7 +57,8 @@ subroutine q65_loops(c00,npts2,nsps,mode,mode64,nsubmode,nFadingModel,   &
               call pctile(s3,LL*NN,40,base)
               s3=s3/base
               where(s3(1:LL*NN)>s3lim) s3(1:LL*NN)=s3lim
-           else
+           endif
+           if(iavg.eq.1) then
               s3(1:LL*NN)=s3avg(1:LL*NN)
            endif
            do ibw=ibwmin,ibwmax
@@ -83,7 +84,7 @@ subroutine q65_loops(c00,npts2,nsps,mode,mode64,nsubmode,nFadingModel,   &
            enddo  ! ibw (b90 loop)
         enddo  ! idt (DT loop)
      enddo  ! idf (f0 loop)
-     if(iavg.eq.0) then
+     if(ipass.eq.0 .and. iavg.eq.0) then
         a=0.
         a(1)=-f0
         call twkfreq(c00,c0,npts2,6000.0,a)
diff --git a/lib/sumsim.f90 b/lib/sumsim.f90
index e05f8d4d0..dba801470 100644
--- a/lib/sumsim.f90
+++ b/lib/sumsim.f90
@@ -24,14 +24,15 @@ program sumsim
      nfsample=h%nsamrate
      read(10) iwave(1:npts)
      n=len(trim(fname))
-     wave(1:npts)=wave(1:npts)+iwave(1:npts)
+     wave(1:npts)=wave(1:npts) + iwave(1:npts)
      rms=sqrt(dot_product(wave(1:npts),wave(1:npts))/npts)
      write(*,1000) ifile,npts,float(npts)/nfsample,rms,fname(n-14:n)
 1000 format(i3,i8,f6.1,f10.3,2x,a15)
      close(10)
   enddo
 
-  fac=1.0/sqrt(float(nargs))
+!  fac=1.0/sqrt(float(nargs))
+  fac=1.0/nargs
   iwave(1:npts)=nint(fac*wave(1:npts))
   
   open(12,file='000000_0000.wav',access='stream',status='unknown')