diff --git a/libm65/genjt9.f90 b/libm65/genjt9.f90
index 97779f195..d8a109aae 100644
--- a/libm65/genjt9.f90
+++ b/libm65/genjt9.f90
@@ -1,7 +1,8 @@
 subroutine genjt9(message,minutes,msgsent,d6)
 
-! Encodes a "JT9-minutes" message and returns array d6(85) of tone
-! values in the range 0-8.  
+! Encodes a JT9 message and returns msgsent, the message as it will
+! be decoded, and an integer array d6(85) of 9-FSK tone values 
+! in the range 0-8.  
 
   character*22 message          !Message to be generated
   character*22 msgsent          !Message as it will be received
@@ -10,39 +11,41 @@ subroutine genjt9(message,minutes,msgsent,d6)
 
   integer*4 d0(13)              !72-bit message as 6-bit words
   integer*1 d1(13)              !72 bits and zero tail as 8-bit bytes
-  integer*1 d2(206)             !Encoded information-carrying bits
-  integer*1 d3(206)             !Bits from d2, after interleaving
+  integer*1 d2(207)             !Encoded information-carrying bits
+  integer*1 d3(207)             !Bits from d2, after interleaving
   integer*4 d4(69)              !Symbols from d3, values 0-7
   integer*4 d5(69)              !Gray-coded symbols, values 0-7
   integer*4 d6(85)              !Channel symbols including sync, values 0-8
 
   integer*4 t0(13)              !72-bit message as 6-bit words
   integer*1 t1(13)              !72 bits and zero tail as 8-bit bytes
-  integer*1 t2(206)             !Encoded information-carrying bits
-  integer*1 t3(206)             !Bits from d2, after interleaving
-  integer*4 t4(69)              !Symbols from d3, values 0-7
+  integer*1 t2(207)             !Encoded information-carrying bits
+  integer*1 t3(207)             !Bits from t4, after interleaving
+  integer*4 t4(69)              !Symbols from t5, values 0-7
   integer*4 t5(69)              !Gray-coded symbols, values 0-7
   integer*4 t6(85)              !Channel symbols including sync, values 0-8
+
   integer*1 tmp(72)
 
-  integer isync(85)
+  integer*1 i1
+  equivalence (i1,i4)
+  integer isync(85)             !Sync vector
   data isync/                                    &
        1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,  &
        1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,1,0,  &
        0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,  &
        0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,  &
        1,0,0,0,1/
-  data twopi/6.283185307179586476d0/
   save
 
   call packmsg(message,d0)           !Pack message into 12 6-bit bytes
-  call unpackmsg(d0,msgsent)
-  call entail(d0,d1)
+  call unpackmsg(d0,msgsent)         !Unpack d0 to get msgsent
+  call entail(d0,d1)                 !Add tail, convert to 8-bit bytes
   nsym2=206
   call encode232(d1,nsym2,d2)        !Convolutional code, K=32, r=1/2
-  call interleave9(d2,1,d3)
-  call packbits(d3,nsym2,3,d4)
-  call graycode(d4,69,1,d5)
+  call interleave9(d2,1,d3)          !Interleave the single bits
+  call packbits(d3,nsym2,3,d4)       !Pack 3-bit groups into words
+  call graycode(d4,69,1,d5)          !Apply Gray code
 
 ! Insert sync symbols (ntone=0) and add 1 to the data-tone numbers.
   j=0
@@ -55,7 +58,7 @@ subroutine genjt9(message,minutes,msgsent,d6)
      endif
   enddo
 
-  if(j.ne.999) return
+! We're done!  Now reverse the process, as a test.
 
   t6=d6
   j=0
@@ -66,9 +69,8 @@ subroutine genjt9(message,minutes,msgsent,d6)
   enddo
 
   call graycode(t5,69,-1,t4)
-  call unpackbits(t4,nsym2,3,t3)
+  call unpackbits(t4,69,3,t3)
   call interleave9(t3,-1,t2)
-!  print*,'A',d2-t2
 
 ! Get the metric table
   bias=0.37
@@ -76,27 +78,40 @@ subroutine genjt9(message,minutes,msgsent,d6)
   open(19,file='met8.21',status='old')
 
   do i=0,255
-     read(19,*) xjunk,x0,x1
+     read(19,*) x00,x0,x1
      mettab(i,0)=nint(scale*(x0-bias))
      mettab(i,1)=nint(scale*(x1-bias))    !### Check range, etc.  ###
   enddo
-  print*,'b'
+  close(19)
 
+  nbits=72
   ndelta=17
-  ntimeout=0
   limit=1000
-  call fano232(t2,72+31,mettab,ndelta,limit,t1,ncycles,metric,ierr)
-  print*,t1
-!  if(ncycles/(72+31).ge.limit) ntimeout=1
-!  nbytes=(nbits+7)/8
-!  do i=1,nbytes
-!     n=t1(i)
-!     t4(i)=iand(n,255)
-!  enddo
-!  call unpackbits(t1,9,8,tmp)
-!  call packbits(tmp,12,6,t0)
-!  print*,'z',t0
+  do i=1,206
+     i4=-10
+     if(t2(i).eq.1) i4=10
+     i4=i4+128
+     t2(i)=i1
+  enddo
+  
+  call fano232(t2,nbits+31,mettab,ndelta,limit,t1,ncycles,metric,ierr,   &
+       maxmetric,maxnp)
 
+  nbytes=(nbits+7)/8
+  do i=1,nbytes
+     n=t1(i)
+     t4(i)=iand(n,255)
+  enddo
+  call unpackbits(t4,nbytes,8,tmp)
+  call packbits(tmp,12,6,t4)
+  do i=1,12
+     if(t4(i).lt.128) t1(i)=t4(i)
+     if(t4(i).ge.128) t1(i)=t4(i)-256
+  enddo
+  do i=1,12
+     t4(i)=t1(i)
+  enddo
+  print*,'z0',d0(1:12)-t4(1:12)
 
   return
 end subroutine genjt9
diff --git a/mainwindow.cpp b/mainwindow.cpp
index d1d67f2ab..ce9415bef 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,4 +1,4 @@
-//--------------------------------------------------------------- MainWindow
+//-------------------------------------------------------------- MainWindow
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include "devsetup.h"