diff --git a/codebase/general/src.bin/dmap/dmapblkinx.1.6/dmapblkinx.c b/codebase/general/src.bin/dmap/dmapblkinx.1.6/dmapblkinx.c
index e0db49b0a..b652cdbd9 100644
--- a/codebase/general/src.bin/dmap/dmapblkinx.1.6/dmapblkinx.c
+++ b/codebase/general/src.bin/dmap/dmapblkinx.1.6/dmapblkinx.c
@@ -58,6 +58,7 @@ int main(int argc,char *argv[]) {
 
   unsigned char help=0;
   unsigned char option=0;
+  unsigned char version=0;
   unsigned char zflg=0;
 
 
@@ -68,6 +69,7 @@ int main(int argc,char *argv[]) {
 
   OptionAdd(&opt,"-help",'x',&help);
   OptionAdd(&opt,"-option",'x',&option);
+  OptionAdd(&opt,"-version",'x',&version);
   OptionAdd(&opt,"z",'x',&zflg);
 
   arg=OptionProcess(1,argc,argv,&opt,rst_opterr);
@@ -80,11 +82,17 @@ int main(int argc,char *argv[]) {
     OptionPrintInfo(stdout,hlpstr);
     exit(0);
   }
+
   if (option==1) {
     OptionDump(stdout,&opt);
     exit(0);
   }
 
+  if (version==1) {
+    OptionVersion(stdout);
+    exit(0);
+  }
+
   if (arg !=argc) {
     if (zflg) {
       zfp=gzopen(argv[arg],"r");
diff --git a/codebase/general/src.bin/dmap/dmapblkinx.1.6/doc/dmapblkinx.doc.xml b/codebase/general/src.bin/dmap/dmapblkinx.1.6/doc/dmapblkinx.doc.xml
index 5b88a6402..f73399192 100644
--- a/codebase/general/src.bin/dmap/dmapblkinx.1.6/doc/dmapblkinx.doc.xml
+++ b/codebase/general/src.bin/dmap/dmapblkinx.1.6/doc/dmapblkinx.doc.xml
@@ -4,8 +4,12 @@
 <name>dmapblkinx</name>
 <location>src.bin/dmap/dmapblkinx</location>
 <syntax>dmapblkinx --help</syntax>
+<syntax>dmapblkinx [<ar>name</ar>]</syntax>
+
 <option><on>--help</on><od>print the help message and exit.</od>
 </option>
+<option><on>--version</on><od>print the RST version number and exit.</od>
+</option>
 <option><on><ar>name</ar></on><od>filename of the DataMap file, if this is omitted the document will be read from standard input.</od>
 </option>
 <synopsis><p>Dump the block index (file offsets for each block) of a DataMap file.</p></synopsis>
@@ -13,13 +17,10 @@
 <p>The offsets are written to standard output. The block offsets can be used to quickly locate a specific block in the DataMap file.</p>
 </description>
 
-
 <example>
 <command>dmapblkinx inp.dmap &gt; out.binx</command>
-<description>Find the block offsets from the  file <code>inp.dmap</code> and store them in the file <code>out.binx</code>
+<description>Find the block offsets from the file <code>inp.dmap</code> and store them in the file <code>out.binx</code>
 </description>
 </example>
 
-
-
 </binary>
diff --git a/codebase/general/src.bin/dmap/dmapdump.1.12/dmapdump.c b/codebase/general/src.bin/dmap/dmapdump.1.12/dmapdump.c
index 2449be276..3084f3d18 100644
--- a/codebase/general/src.bin/dmap/dmapdump.1.12/dmapdump.c
+++ b/codebase/general/src.bin/dmap/dmapdump.1.12/dmapdump.c
@@ -61,6 +61,7 @@ int main(int argc,char *argv[]) {
   unsigned char zflg=0;
   unsigned char help=0;
   unsigned char option=0;
+  unsigned char version=0;
 
 
   FILE *fp=NULL;
@@ -70,6 +71,7 @@ int main(int argc,char *argv[]) {
 
   OptionAdd(&opt,"-help",'x',&help);
   OptionAdd(&opt,"-option",'x',&option);
+  OptionAdd(&opt,"-version",'x',&version);
   OptionAdd(&opt,"z",'x',&zflg);
 
   OptionAdd(&opt,"d",'x',&dflg);
@@ -85,11 +87,17 @@ int main(int argc,char *argv[]) {
     OptionPrintInfo(stdout,hlpstr);
     exit(0);
   }
+
   if (option==1) {
     OptionDump(stdout,&opt);
     exit(0);
   }
 
+  if (version==1) {
+    OptionVersion(stdout);
+    exit(0);
+  }
+
   if (arg !=argc) {
     if (zflg) {
       zfp=gzopen(argv[arg],"r");
diff --git a/codebase/general/src.bin/dmap/dmapdump.1.12/doc/dmapdump.doc.xml b/codebase/general/src.bin/dmap/dmapdump.1.12/doc/dmapdump.doc.xml
index d4ebb5c73..36466885c 100644
--- a/codebase/general/src.bin/dmap/dmapdump.1.12/doc/dmapdump.doc.xml
+++ b/codebase/general/src.bin/dmap/dmapdump.1.12/doc/dmapdump.doc.xml
@@ -5,8 +5,11 @@
 <location>src.bin/dmap/dmapdump</location>
 <syntax>dmapdump --help</syntax>
 <syntax>dmapdump [-d] [<ar>name</ar>]</syntax>
+
 <option><on>--help</on><od>print the help message and exit.</od>
 </option>
+<option><on>--version</on><od>print the RST version number and exit.</od>
+</option>
 <option><on>-d</on><od>print the data values of the array variables.</od>
 </option>
 <option><on><ar>name</ar></on><od>filename of the DataMap file, if this is omitted the document will be read from standard input.</od>
@@ -21,5 +24,4 @@
 </description>
 </example>
 
-
 </binary>
diff --git a/codebase/general/src.bin/dmap/dmaptocdf.1.9/dmaptocdf.c b/codebase/general/src.bin/dmap/dmaptocdf.1.9/dmaptocdf.c
index 8fd70937e..060aae859 100644
--- a/codebase/general/src.bin/dmap/dmaptocdf.1.9/dmaptocdf.c
+++ b/codebase/general/src.bin/dmap/dmaptocdf.1.9/dmaptocdf.c
@@ -126,14 +126,14 @@ int loadmap(FILE *fp) {
       if (cdfaname==NULL) cdfaname=malloc(sizeof(char *));
       else {
         char **tmp;
-        tmp=realloc(cdfaname,(snum+1)*sizeof(char *));
+        tmp=realloc(cdfaname,(anum+1)*sizeof(char *));
         if (tmp==NULL) break;
         cdfaname=tmp;
       }  
       aptr[anum]=DataMapMakeArray(buf+x+1,0,t,dim,NULL,NULL);
       anum++;
     }
- 
+
     x=y+1;
     while ((buf[x] !='=') && (x<off)) x++;
     while ((!isalnum(buf[x])) && (x<off)) x++;
@@ -165,23 +165,21 @@ int main(int argc,char *argv[]) {
   unsigned char vbflg=0;
   unsigned char help=0;
   unsigned char option=0;
+  unsigned char version=0;
   unsigned char zflg=0;
 
-
   FILE *fp=NULL;
   gzFile zfp=0;
   FILE *mapfp;
   int n,c,x;
   int block=0;
- 
-   
+
   CDFid id;
   CDFstatus status;
 
   int sze;
 
-
-  int varid;   
+  int varid;
   int nume;
   char *buf=NULL;
   char **strptr;
@@ -192,6 +190,7 @@ int main(int argc,char *argv[]) {
 
   OptionAdd(&opt,"-help",'x',&help);
   OptionAdd(&opt,"-option",'x',&option);
+  OptionAdd(&opt,"-version",'x',&version);
   OptionAdd(&opt,"vb",'x',&vbflg);
   OptionAdd(&opt,"z",'x',&zflg);
 
@@ -207,11 +206,17 @@ int main(int argc,char *argv[]) {
       OptionPrintInfo(stdout,hlpstr);
       exit(0);
     }
+
     if (option==1) {
       OptionDump(stdout,&opt);
       exit(0);
     }
 
+    if (version==1) {
+      OptionVersion(stdout);
+      exit(0);
+    }
+
     if (zflg) {
       zfp=gzopen(argv[arg],"r");
       if (zfp==0) {
@@ -224,7 +229,7 @@ int main(int argc,char *argv[]) {
         fprintf(stderr,"File not found.\n");
         exit(-1);
       }
-    }  
+    }
 
   } else {
     OptionPrintInfo(stdout,errstr);
@@ -252,7 +257,6 @@ int main(int argc,char *argv[]) {
 
     if (ptr==NULL) break;
 
-
     for (c=0;c<ptr->snum;c++) {
       sx=ptr->scl[c];
       for (n=0;n<snum;n++) {
@@ -262,12 +266,12 @@ int main(int argc,char *argv[]) {
         break;
       }
       if (n !=snum) { /* mapped variable */
-       status=CDFlib(GET_,rVAR_NUMBER_,cdfsname[n],&varid,NULL_);
+        status=CDFlib(GET_,rVAR_NUMBER_,cdfsname[n],&varid,NULL_);
         if (status !=CDF_OK) {
           fprintf(stderr,"Error accessing CDF file.\n");
           exit(-1);
         }
-      
+
         switch (sx->type) {
         case DATACHAR:
           status=CDFlib(SELECT_,rVAR_,varid,
@@ -278,26 +282,21 @@ int main(int argc,char *argv[]) {
           status=CDFlib(SELECT_,rVAR_,varid,
                         SELECT_,rVARs_RECNUMBER_,block,
                         PUT_,rVAR_DATA_,sx->data.vptr,NULL_);
-        
           break;
         case DATAINT:
           status=CDFlib(SELECT_,rVAR_,varid,
                         SELECT_,rVARs_RECNUMBER_,block,
                         PUT_,rVAR_DATA_,sx->data.vptr,NULL_);
-
-         
           break;
         case DATAFLOAT:
           status=CDFlib(SELECT_,rVAR_,varid,
-                     SELECT_,rVARs_RECNUMBER_,block,
-                     PUT_,rVAR_DATA_,sx->data.vptr,NULL_);
-
+                        SELECT_,rVARs_RECNUMBER_,block,
+                        PUT_,rVAR_DATA_,sx->data.vptr,NULL_);
           break;
         case DATADOUBLE:
-           status=CDFlib(SELECT_,rVAR_,varid,
-                     SELECT_,rVARs_RECNUMBER_,block,
-                     PUT_,rVAR_DATA_,sx->data.vptr,NULL_);
-
+          status=CDFlib(SELECT_,rVAR_,varid,
+                        SELECT_,rVARs_RECNUMBER_,block,
+                        PUT_,rVAR_DATA_,sx->data.vptr,NULL_);
           break;
         case DATASTRING:
           status=CDFlib(SELECT_,rVAR_,varid,GET_,rVAR_NUMELEMS_,&nume,NULL_);
@@ -308,35 +307,32 @@ int main(int argc,char *argv[]) {
           if (*((char **) sx->data.vptr) !=NULL) 
             strcpy(buf,*((char **) sx->data.vptr));
 
-
-         
           status=CDFlib(SELECT_,rVAR_,varid,
                      SELECT_,rVARs_RECNUMBER_,block,
                      PUT_,rVAR_DATA_,buf,NULL_);
 
-	  free(buf);
+          free(buf);
           break;
-	}
+        }
         if (status !=CDF_OK) {
           fprintf(stderr,"Error writing CDF file (%d).\n",(int) status);
           exit(-1);
         }
-       
       }
     }
-    
+
     for (c=0;c<ptr->anum;c++) {
       ax=ptr->arr[c];
       for (n=0;n<anum;n++) {
         ay=aptr[n];
-      
+
         if (strcmp(ax->name,ay->name) !=0) continue;
         if (ax->type !=ay->type) continue;
         if (ax->dim !=ay->dim) continue;
         break;
       }
       if (n !=anum) { 
-      
+
         status=CDFlib(GET_,zVAR_NUMBER_,cdfaname[n],&varid,NULL_);
         if (status !=CDF_OK) {
           fprintf(stderr,"Error accessing CDF file.\n");
@@ -349,100 +345,90 @@ int main(int argc,char *argv[]) {
           intervals[x]=1;
           counts[x]=ax->rng[x];
           sze=sze*ax->rng[x];
-	}   
+        }
         if (sze==0) continue;
 
-	if (ax->type==DATASTRING) {
-	  status=CDFlib(SELECT_,zVAR_,varid,GET_,zVAR_NUMELEMS_,&nume,NULL_);
+        if (ax->type==DATASTRING) {
+          status=CDFlib(SELECT_,zVAR_,varid,GET_,zVAR_NUMELEMS_,&nume,NULL_);
           if (status !=CDF_OK) break;
           buf=malloc(nume*sze);
           if (buf==NULL) break;
           memset(buf,0,sze*nume);
-	  strptr=(char **) ax->data.vptr;
+          strptr=(char **) ax->data.vptr;
           for (x=0;x<sze;x++) strncpy(buf+x*nume,strptr[x],nume);
-	}
-
+        }
 
-        switch (ax->type) { 
+        switch (ax->type) {
         case DATACHAR:
-	  status=CDFlib(SELECT_,
-                              zVAR_,varid,zVAR_RECNUMBER_,block,
-                              zVAR_RECCOUNT_,1,
-			      zVAR_RECINTERVAL_,1,
-                              zVAR_DIMINDICES_,indices,
-                              zVAR_DIMCOUNTS_,counts,
-                              zVAR_DIMINTERVALS_,intervals, 
-                              PUT_,zVAR_HYPERDATA_,ax->data.vptr,NULL_);
+          status=CDFlib(SELECT_,
+                        zVAR_,varid,zVAR_RECNUMBER_,block,
+                        zVAR_RECCOUNT_,1,
+                        zVAR_RECINTERVAL_,1,
+                        zVAR_DIMINDICES_,indices,
+                        zVAR_DIMCOUNTS_,counts,
+                        zVAR_DIMINTERVALS_,intervals, 
+                        PUT_,zVAR_HYPERDATA_,ax->data.vptr,NULL_);
           break;
         case DATASHORT:
           status=CDFlib(SELECT_,
-                              zVAR_,varid,zVAR_RECNUMBER_,block,
-                              zVAR_RECCOUNT_,1,
-			      zVAR_RECINTERVAL_,1,
-                              zVAR_DIMINDICES_,indices,
-                              zVAR_DIMCOUNTS_,counts,
-                              zVAR_DIMINTERVALS_,intervals, 
-                              PUT_,zVAR_HYPERDATA_,ax->data.vptr,NULL_);
-    
-           break;
+                        zVAR_,varid,zVAR_RECNUMBER_,block,
+                        zVAR_RECCOUNT_,1,
+                        zVAR_RECINTERVAL_,1,
+                        zVAR_DIMINDICES_,indices,
+                        zVAR_DIMCOUNTS_,counts,
+                        zVAR_DIMINTERVALS_,intervals, 
+                        PUT_,zVAR_HYPERDATA_,ax->data.vptr,NULL_);
+          break;
         case DATAINT:
-	   status=CDFlib(SELECT_,
-                              zVAR_,varid,zVAR_RECNUMBER_,block,
-                              zVAR_RECCOUNT_,1,
-			      zVAR_RECINTERVAL_,1,
-                              zVAR_DIMINDICES_,indices,
-                              zVAR_DIMCOUNTS_,counts,
-                              zVAR_DIMINTERVALS_,intervals, 
-                              PUT_,zVAR_HYPERDATA_,ax->data.vptr,NULL_);       
-           break;
+          status=CDFlib(SELECT_,
+                        zVAR_,varid,zVAR_RECNUMBER_,block,
+                        zVAR_RECCOUNT_,1,
+                        zVAR_RECINTERVAL_,1,
+                        zVAR_DIMINDICES_,indices,
+                        zVAR_DIMCOUNTS_,counts,
+                        zVAR_DIMINTERVALS_,intervals, 
+                        PUT_,zVAR_HYPERDATA_,ax->data.vptr,NULL_);
+          break;
         case DATAFLOAT:
-                status=CDFlib(SELECT_,
-                              zVAR_,varid,zVAR_RECNUMBER_,block,
-                              zVAR_RECCOUNT_,1,
-			      zVAR_RECINTERVAL_,1,
-                              zVAR_DIMINDICES_,indices,
-                              zVAR_DIMCOUNTS_,counts,
-                              zVAR_DIMINTERVALS_,intervals, 
-                              PUT_,zVAR_HYPERDATA_,ax->data.vptr,NULL_);
- 	 
-           break;
+          status=CDFlib(SELECT_,
+                        zVAR_,varid,zVAR_RECNUMBER_,block,
+                        zVAR_RECCOUNT_,1,
+                        zVAR_RECINTERVAL_,1,
+                        zVAR_DIMINDICES_,indices,
+                        zVAR_DIMCOUNTS_,counts,
+                        zVAR_DIMINTERVALS_,intervals, 
+                        PUT_,zVAR_HYPERDATA_,ax->data.vptr,NULL_);
+          break;
         case DATADOUBLE:
-	    status=CDFlib(SELECT_,
-                              zVAR_,varid,zVAR_RECNUMBER_,block,
-                              zVAR_RECCOUNT_,1,
-			      zVAR_RECINTERVAL_,1,
-                              zVAR_DIMINDICES_,indices,
-                              zVAR_DIMCOUNTS_,counts,
-                              zVAR_DIMINTERVALS_,intervals, 
-                              PUT_,zVAR_HYPERDATA_,ax->data.vptr,NULL_);
-           break;
+          status=CDFlib(SELECT_,
+                        zVAR_,varid,zVAR_RECNUMBER_,block,
+                        zVAR_RECCOUNT_,1,
+                        zVAR_RECINTERVAL_,1,
+                        zVAR_DIMINDICES_,indices,
+                        zVAR_DIMCOUNTS_,counts,
+                        zVAR_DIMINTERVALS_,intervals, 
+                        PUT_,zVAR_HYPERDATA_,ax->data.vptr,NULL_);
+          break;
         case DATASTRING:
-	  status=CDFlib(SELECT_,
-			zVAR_,varid,zVAR_RECNUMBER_,block,
-			zVAR_RECCOUNT_,1,
-			zVAR_RECINTERVAL_,1,
-			zVAR_DIMINDICES_,indices,
-			zVAR_DIMCOUNTS_,counts,
-			zVAR_DIMINTERVALS_,intervals,
-			PUT_,zVAR_HYPERDATA_,buf,NULL_);
-
-	   free(buf);
-
-
-	   break;
-	}
-       
+          status=CDFlib(SELECT_,
+                        zVAR_,varid,zVAR_RECNUMBER_,block,
+                        zVAR_RECCOUNT_,1,
+                        zVAR_RECINTERVAL_,1,
+                        zVAR_DIMINDICES_,indices,
+                        zVAR_DIMCOUNTS_,counts,
+                        zVAR_DIMINTERVALS_,intervals,
+                        PUT_,zVAR_HYPERDATA_,buf,NULL_);
+          free(buf);
+          break;
+        }
 
         if ((status !=CDF_OK) && (status !=VIRTUAL_RECORD_DATA)) {
           fprintf(stderr,"Error writing CDF file (%d).\n",(int) status);
           exit(-1);
         }
 
-
- 
       }
     }
-    
 
     DataMapFree(ptr);
     block++;
diff --git a/codebase/general/src.bin/dmap/dmaptocdf.1.9/doc/dmaptocdf.doc.xml b/codebase/general/src.bin/dmap/dmaptocdf.1.9/doc/dmaptocdf.doc.xml
index b7a450fe5..608c69a46 100644
--- a/codebase/general/src.bin/dmap/dmaptocdf.1.9/doc/dmaptocdf.doc.xml
+++ b/codebase/general/src.bin/dmap/dmaptocdf.1.9/doc/dmaptocdf.doc.xml
@@ -5,8 +5,11 @@
 <location>src.bin/dmap/dmaptocdf</location>
 <syntax>dmaptocdf --help</syntax>
 <syntax>dmaptocdf [-vb] <ar>datamap</ar> <ar>map</ar> <ar>cdf</ar></syntax>
+
 <option><on>--help</on><od>print the help message and exit.</od>
 </option>
+<option><on>--version</on><od>print the RST version number and exit.</od>
+</option>
 <option><on>-vb</on><od>verbose. Log information to the console.</od>
 </option>
 <option><on><ar>datamap</ar></on><od>filename of the DataMap file to convert.</od>
@@ -31,8 +34,4 @@
 <description>Populate the empty CDF file "<code>20021219.kap.cdf</code>" with data from the file "<code>20021219.kap.fitacf</code>" using the mapping table "<code>fitacf.cdfmap</code>".</description>
 </example>
 
-
-
-
-
 </binary>
diff --git a/codebase/general/src.bin/dmap/dmaptocdl.1.9/dmaptocdl.c b/codebase/general/src.bin/dmap/dmaptocdl.1.9/dmaptocdl.c
index 034cfdb61..76f27ba77 100644
--- a/codebase/general/src.bin/dmap/dmaptocdl.1.9/dmaptocdl.c
+++ b/codebase/general/src.bin/dmap/dmaptocdl.1.9/dmaptocdl.c
@@ -94,6 +94,7 @@ int main(int argc,char *argv[]) {
   unsigned char vbflg=0;
   unsigned char help=0;
   unsigned char option=0;
+  unsigned char version=0;
   unsigned char zflg=0;
 
 
@@ -104,6 +105,7 @@ int main(int argc,char *argv[]) {
 
   OptionAdd(&opt,"-help",'x',&help);
   OptionAdd(&opt,"-option",'x',&option);
+  OptionAdd(&opt,"-version",'x',&version);
   OptionAdd(&opt,"vb",'x',&vbflg);
   OptionAdd(&opt,"z",'x',&zflg);
 
@@ -119,11 +121,17 @@ int main(int argc,char *argv[]) {
       OptionPrintInfo(stdout,hlpstr);
       exit(0);
     }
+
     if (option==1) {
       OptionDump(stdout,&opt);
       exit(0);
     }
 
+    if (version==1) {
+      OptionVersion(stdout);
+      exit(0);
+    }
+
     if (zflg) {
       zfp=gzopen(argv[arg],"r");
       if (zfp==0) {
diff --git a/codebase/general/src.bin/dmap/dmaptocdl.1.9/doc/dmaptocdl.doc.xml b/codebase/general/src.bin/dmap/dmaptocdl.1.9/doc/dmaptocdl.doc.xml
index 11f2905b3..e98122213 100644
--- a/codebase/general/src.bin/dmap/dmaptocdl.1.9/doc/dmaptocdl.doc.xml
+++ b/codebase/general/src.bin/dmap/dmaptocdl.1.9/doc/dmaptocdl.doc.xml
@@ -5,8 +5,11 @@
 <location>src.bin/dmap/dmaptocdl</location>
 <syntax>dmaptocdl --help</syntax>
 <syntax>dmaptocdl [-vb] <ar>datamap</ar> <ar>cdl</ar> <ar>map</ar></syntax>
+
 <option><on>--help</on><od>print the help message and exit.</od>
 </option>
+<option><on>--version</on><od>print the RST version number and exit.</od>
+</option>
 <option><on>-vb</on><od>verbose. Log information to the console.</od>
 </option>
 <option><on><ar>datamap</ar></on><od>filename of the DataMap file to scan.</od>
@@ -28,12 +31,9 @@
 <p>The tool <code>dmaptocdl</code> first analyses a dmap file to determine the size of the arrays required and produces an outline CDL file. The user can edit this CDL file to correct any problems and add any meta-data (attributes).</p>
 </description>
 
-
-
 <example>
 <command>dmaptocdl 20021219.kap.fitacf fitacf.cdl fitmacf.cdfmap</command>
 <description>Generate the CDL file  "<code>fitacf.cdl</code>" and mapping table  "<code>fitacf.cdfmap</code>" from the file "<code>20021219.kap.fitacf</code>".</description>
 </example>
 
-
 </binary>
diff --git a/codebase/general/src.bin/dmap/dmaptoncdf.1.11/dmaptoncdf.c b/codebase/general/src.bin/dmap/dmaptoncdf.1.11/dmaptoncdf.c
index 3e44df010..0a372373a 100644
--- a/codebase/general/src.bin/dmap/dmaptoncdf.1.11/dmaptoncdf.c
+++ b/codebase/general/src.bin/dmap/dmaptoncdf.1.11/dmaptoncdf.c
@@ -45,9 +45,6 @@
 #include "errstr.h"
 
 
-
-
-
 int snum=0;
 struct DataMapScalar **sptr=NULL;
 char **cdfsname;
@@ -59,7 +56,6 @@ char **cdfaname;
 struct OptionData opt;
 int arg=0;
 
-
 int loadmap(FILE *fp) {
   char buf[256];
   int off=0;
@@ -85,7 +81,7 @@ int loadmap(FILE *fp) {
     t=0;
     if (strncmp(buf+x,"char",4)==0) t=DATACHAR;
     if (strncmp(buf+x,"short",5)==0) t=DATASHORT;
-    if (strncmp(buf+x,"long",4)==0) t=DATAINT;
+    if (strncmp(buf+x,"int",3)==0) t=DATAINT;
     if (strncmp(buf+x,"float",5)==0) t=DATAFLOAT;
     if (strncmp(buf+x,"double",6)==0) t=DATADOUBLE;
     if (strncmp(buf+x,"string",6)==0) t=DATASTRING;
@@ -128,14 +124,14 @@ int loadmap(FILE *fp) {
       if (cdfaname==NULL) cdfaname=malloc(sizeof(char *));
       else {
         char **tmp;
-        tmp=realloc(cdfaname,(snum+1)*sizeof(char *));
+        tmp=realloc(cdfaname,(anum+1)*sizeof(char *));
         if (tmp==NULL) break;
         cdfaname=tmp;
       }  
       aptr[anum]=DataMapMakeArray(buf+x+1,0,t,dim,NULL,NULL);
       anum++;
     }
- 
+
     x=y+1;
     while ((buf[x] !='=') && (x<off)) x++;
     while ((!isalnum(buf[x])) && (x<off)) x++;
@@ -171,6 +167,7 @@ int main(int argc,char *argv[]) {
   unsigned char vbflg=0;
   unsigned char help=0;
   unsigned char option=0;
+  unsigned char version=0;
   unsigned char zflg=0;
 
   FILE *fp=NULL;
@@ -180,19 +177,19 @@ int main(int argc,char *argv[]) {
   int n,c,x;
   int ncid;
   int block=0;
- 
+
   int varid;
-  
+
   int strsze;
   char **strptr;
   char *tmpbuf=NULL;
 
   OptionAdd(&opt,"-help",'x',&help);
   OptionAdd(&opt,"-option",'x',&option);
+  OptionAdd(&opt,"-version",'x',&version);
   OptionAdd(&opt,"vb",'x',&vbflg);
   OptionAdd(&opt,"z",'x',&zflg);
 
-
   if (argc>1) {
     arg=OptionProcess(1,argc,argv,&opt,rst_opterr);
 
@@ -204,11 +201,17 @@ int main(int argc,char *argv[]) {
       OptionPrintInfo(stdout,hlpstr);
       exit(0);
     }
+
     if (option==1) {
       OptionDump(stdout,&opt);
       exit(0);
     }
 
+    if (version==1) {
+      OptionVersion(stdout);
+      exit(0);
+    }
+
     if (zflg) {
       zfp=gzopen(argv[arg],"r");
       if (zfp==0) {
@@ -221,7 +224,7 @@ int main(int argc,char *argv[]) {
         fprintf(stderr,"File not found.\n");
         exit(-1);
       }
-    }  
+    }
 
   } else {
     OptionPrintInfo(stdout,errstr);
@@ -235,18 +238,12 @@ int main(int argc,char *argv[]) {
   loadmap(mapfp);
   fclose(mapfp);
 
- 
-
   s=nc_open(argv[arg+2],NC_WRITE,&ncid);
   if (s !=NC_NOERR) {
     fprintf(stderr,"Error opening CDF file.\n");
     exit(-1);
   }
 
-
-   
-
-
   block=0;
   while (1) {
 
@@ -278,7 +275,7 @@ int main(int argc,char *argv[]) {
           s=nc_put_var1_short(ncid,varid,index,sx->data.sptr);
           break;
         case DATAINT:
-          s=nc_put_var1_long(ncid,varid,index,(long *) sx->data.iptr);
+          s=nc_put_var1_int(ncid,varid,index,sx->data.iptr);
           break;
         case DATAFLOAT:
           s=nc_put_var1_float(ncid,varid,index,sx->data.fptr);
@@ -294,12 +291,12 @@ int main(int argc,char *argv[]) {
           s=nc_put_vara_text(ncid,varid,start,count,
                              *((char **) sx->data.vptr));
           break;
-	}
+        }
         if (s !=NC_NOERR) {
           fprintf(stderr,"Error writing CDF file (%d).\n",s);
           exit(-1);
         }
-       
+
       }
     }
 
@@ -307,14 +304,14 @@ int main(int argc,char *argv[]) {
       ax=ptr->arr[c];
       for (n=0;n<anum;n++) {
         ay=aptr[n];
-      
+
         if (strcmp(ax->name,ay->name) !=0) continue;
         if (ax->type !=ay->type) continue;
         if (ax->dim !=ay->dim) continue;
         break;
       }
       if (n !=anum) { /* mapped variable */
-      
+
         s=nc_inq_varid(ncid,cdfaname[n],&varid);
         if (s !=NC_NOERR) {
           fprintf(stderr,"Error accessing CDF file.\n");
@@ -327,7 +324,7 @@ int main(int argc,char *argv[]) {
           start[1+x]=0;
           count[1+x]=ax->rng[x];
           n=n*ax->rng[x];
-	}
+        }
 
         if (ax->type==DATASTRING) {
           int ndims;
@@ -346,8 +343,8 @@ int main(int argc,char *argv[]) {
           if (ndims-2!=ax->dim) {
             fprintf(stderr,"Error matching dimensions.\n");
             exit(-1);
-	  }
-          
+          }
+
           s=nc_inq_dimlen(ncid,dimids[ndims-1],&dimlen);
           if (s !=NC_NOERR) {
             fprintf(stderr,"Error accessing CDF file.\n");
@@ -358,47 +355,46 @@ int main(int argc,char *argv[]) {
           if (tmpbuf==NULL) {
             fprintf(stderr,"Failed to allocate buffer.\n");
             exit(-1);
-	  }
+          }
           memset(tmpbuf,0,n*strsze);
           start[1+ax->dim]=0;
           count[1+ax->dim]=strsze;
           strptr=(char **) ax->data.vptr;
           for (x=0;x<n;x++) strncpy(tmpbuf+x*strsze,strptr[x],strsze);
-	}               
+        }
 
-        switch (ax->type) { 
+        switch (ax->type) {
         case DATACHAR:
-           s=nc_put_vara_text(ncid,varid,start,count,ax->data.cptr);
-           break;
+          s=nc_put_vara_text(ncid,varid,start,count,ax->data.cptr);
+          break;
         case DATASHORT:
-           s=nc_put_vara_short(ncid,varid,start,count,ax->data.sptr);
-           break;
+          s=nc_put_vara_short(ncid,varid,start,count,ax->data.sptr);
+          break;
         case DATAINT:
-	  s=nc_put_vara_long(ncid,varid,start,count,(long *) ax->data.iptr);
-           break;
+          s=nc_put_vara_int(ncid,varid,start,count,ax->data.iptr);
+          break;
         case DATAFLOAT:
-           s=nc_put_vara_float(ncid,varid,start,count,ax->data.fptr);
-           break;
+          s=nc_put_vara_float(ncid,varid,start,count,ax->data.fptr);
+          break;
         case DATADOUBLE:
-           s=nc_put_vara_double(ncid,varid,start,count,ax->data.dptr);
-           break;
+          s=nc_put_vara_double(ncid,varid,start,count,ax->data.dptr);
+          break;
         case DATASTRING:
-           s=nc_put_vara_text(ncid,varid,start,count,tmpbuf);
-	   break;
-	}
+          s=nc_put_vara_text(ncid,varid,start,count,tmpbuf);
+          break;
+        }
         if (tmpbuf !=NULL) {
-	  free(tmpbuf);
+          free(tmpbuf);
           tmpbuf=NULL;
-	}
+        }
 
         if (s !=NC_NOERR) {
           fprintf(stderr,"Error writing CDF file (%d).\n",s);
           exit(-1);
         }
- 
+
       }
     }
-  
 
     DataMapFree(ptr);
     block++;
diff --git a/codebase/general/src.bin/dmap/dmaptoncdf.1.11/doc/dmaptoncdf.doc.xml b/codebase/general/src.bin/dmap/dmaptoncdf.1.11/doc/dmaptoncdf.doc.xml
index 131cc25dd..0c9f716f3 100644
--- a/codebase/general/src.bin/dmap/dmaptoncdf.1.11/doc/dmaptoncdf.doc.xml
+++ b/codebase/general/src.bin/dmap/dmaptoncdf.1.11/doc/dmaptoncdf.doc.xml
@@ -3,11 +3,13 @@
 <project>general</project>
 <name>dmaptoncdf</name>
 <location>src.bin/dmap/dmaptoncdf</location>
-
 <syntax>dmaptoncdf --help</syntax>
 <syntax>dmaptoncdf [-vb] <ar>datamap</ar> <ar>map</ar> <ar>netcdf</ar></syntax>
+
 <option><on>--help</on><od>print the help message and exit.</od>
 </option>
+<option><on>--version</on><od>print the RST version number and exit.</od>
+</option>
 <option><on>-vb</on><od>verbose. Log information to the console.</od>
 </option>
 <option><on><ar>datamap</ar></on><od>filename of the DataMap file to convert.</od>
diff --git a/codebase/general/src.bin/dmap/dmaptoskeleton.1.8/dmaptoskeleton.c b/codebase/general/src.bin/dmap/dmaptoskeleton.1.8/dmaptoskeleton.c
index 6d5bedb31..0a72a4b72 100644
--- a/codebase/general/src.bin/dmap/dmaptoskeleton.1.8/dmaptoskeleton.c
+++ b/codebase/general/src.bin/dmap/dmaptoskeleton.1.8/dmaptoskeleton.c
@@ -52,7 +52,6 @@ int snum=0;
 struct DataMapScalar **sptr=NULL;
 char **cdfsname;
 
-
 int anum=0;
 struct DataMapArray **aptr=NULL;
 char **cdfaname;
@@ -61,7 +60,6 @@ int32 *rptr=NULL;
 int32 *roff=NULL;
 int rnum=0; 
 
-
 struct OptionData opt;
 int arg=0;
 
@@ -94,16 +92,15 @@ int main(int argc,char *argv[]) {
   int nelm=0;
   unsigned char help=0;
   unsigned char option=0;
-
+  unsigned char version=0;
 
   OptionAdd(&opt,"-help",'x',&help);
   OptionAdd(&opt,"-option",'x',&option);
+  OptionAdd(&opt,"-version",'x',&version);
 
   OptionAdd(&opt,"vb",'x',&vbflg);
   OptionAdd(&opt,"z",'x',&zflg);
 
-
-
   if (argc>1) {
     arg=OptionProcess(1,argc,argv,&opt,rst_opterr);
 
@@ -115,11 +112,17 @@ int main(int argc,char *argv[]) {
       OptionPrintInfo(stdout,hlpstr);
       exit(0);
     }
+
     if (option==1) {
       OptionDump(stdout,&opt);
       exit(0);
     }
 
+    if (version==1) {
+      OptionVersion(stdout);
+      exit(0);
+    }
+
     if (zflg) {
       zfp=gzopen(argv[arg],"r");
       if (zfp==0) {
@@ -132,45 +135,43 @@ int main(int argc,char *argv[]) {
         fprintf(stderr,"File not found.\n");
         exit(-1);
       }
-    }  
+    }
   } else {
     OptionPrintInfo(stdout,errstr);
     exit(-1);
   }
 
-
   if (cdfname==NULL) cdfname=cdfdef;
 
   while (1) {
 
-   if (zflg) ptr=DataMapReadZ(zfp);
+    if (zflg) ptr=DataMapReadZ(zfp);
     else ptr=DataMapFread(fp);
 
     if (ptr==NULL) break;
 
-
     for (c=0;c<ptr->snum;c++) {
       sx=ptr->scl[c];
       for (n=0;n<snum;n++) {
-	sy=sptr[n];
+        sy=sptr[n];
         if (strcmp(sx->name,sy->name) !=0) continue;
         if (sx->type !=sy->type) continue;
         break;
       }
       if (n==snum) {
-	/* copy the scalar */
+        /* copy the scalar */
         if (sptr==NULL) sptr=malloc(sizeof(struct DataMapScalar *));
         else {
           struct DataMapScalar **tmp;
           tmp=realloc(sptr,(snum+1)*sizeof(struct DataMapScalar *));
           if (tmp==NULL) break;
           sptr=tmp;
-	}
+        }
         sptr[snum]=DataMapMakeScalar(sx->name,0,sx->type,NULL);
         snum++;
       }
     }
-    if (c !=ptr->snum) {      
+    if (c !=ptr->snum) {
       status=-1;
       break;
     }
@@ -190,37 +191,34 @@ int main(int argc,char *argv[]) {
       }
 
       if (n==anum) {
-	/* copy the array */
-      
+        /* copy the array */
         if (roff==NULL) roff=malloc(sizeof(int32));
         else {
           int32 *tmp;
           tmp=realloc(roff,(anum+1)*sizeof(int32));
           if (tmp==NULL) break;
-	  roff=tmp;
-	}
+          roff=tmp;
+        }
         roff[anum]=rnum;
         if (rptr==NULL) rptr=malloc(sizeof(int32)*ax->dim);
         else {
           int32 *tmp;
           tmp=realloc(rptr,(rnum+ax->dim)*sizeof(int32));
           if (tmp==NULL) break;
-	  rptr=tmp;
-	}
+            rptr=tmp;
+        }
         for (i=0;i<ax->dim;i++) rptr[rnum+i]=ax->rng[i];
         rnum+=ax->dim;
-	
+
         if (aptr==NULL) aptr=malloc(sizeof(struct DataMapArray *));
         else {
           struct DataMapArray **tmp;
           tmp=realloc(aptr,(anum+1)*sizeof(struct DataMapArray *));
           if (tmp==NULL) break;
           aptr=tmp;
-	}
-        aptr[anum]=DataMapMakeArray(ax->name,0,ax->type,ax->dim,NULL,
-				    NULL);
+        }
+        aptr[anum]=DataMapMakeArray(ax->name,0,ax->type,ax->dim,NULL,NULL);
         anum++;
-       
 
       }
 
@@ -247,7 +245,6 @@ int main(int argc,char *argv[]) {
      if (c !=ax->dim) ax->dim=0;
   }
 
-
   cdfsname=malloc(sizeof(char *)*snum);
   if (cdfsname==NULL) {
     fprintf(stderr,"Could not allocate scalar name table.\n");
@@ -260,14 +257,12 @@ int main(int argc,char *argv[]) {
     exit(-1);
   }
 
-
-
   for (n=0;n<snum;n++) { 
     sx=sptr[n];
     cdfsname[n]=malloc(strlen(sx->name)+1);
     for (c=0;sx->name[c] !=0;c++) 
        if (isalnum(sx->name[c])) cdfsname[n][c]=sx->name[c];
-	   else cdfsname[n][c]='_';
+    else cdfsname[n][c]='_';
     cdfsname[n][c]=0;
     x=0;
     for (c=0;c<n;c++) if (strncmp(cdfsname[c],cdfsname[n],
@@ -295,8 +290,8 @@ int main(int argc,char *argv[]) {
     if (ax->dim==0) continue;
     cdfaname[n]=malloc(strlen(ax->name)+1);
     for (c=0;ax->name[c] !=0;c++) 
-       if (isalnum(ax->name[c])) cdfaname[n][c]=ax->name[c];
-	   else cdfaname[n][c]='_';
+      if (isalnum(ax->name[c])) cdfaname[n][c]=ax->name[c];
+    else cdfaname[n][c]='_';
     cdfaname[n][c]=0;
     for (c=0;c<n;c++) if (strncmp(cdfaname[c],cdfaname[n],
                           strlen(cdfaname[n]))==0) x++;
@@ -337,7 +332,7 @@ int main(int argc,char *argv[]) {
 
   fprintf(fp,"\n#GLOBALattributes\n");
   fprintf(fp,"\n#VARIABLEattributes\n");
- 
+
   fprintf(fp,"\n#variables\n\n");
   for (n=0;n<snum;n++) {
     sx=sptr[n];
@@ -380,11 +375,9 @@ int main(int argc,char *argv[]) {
     fprintf(fp,"! --------          ----     --------\n");
     fprintf(fp,"\n.\n\n");
 
-
-  }  
+  }
   fprintf(fp,"\n#zVariables\n\n");
 
-
   for (n=0;n<anum;n++) {
     ax=aptr[n];
 
@@ -441,51 +434,51 @@ int main(int argc,char *argv[]) {
 
   fp=fopen(argv[3],"w");
   for (n=0;n<snum;n++) {
-   fprintf(fp,"\t");
-     sx=sptr[n];
-     switch(sx->type) {
-     case DATACHAR:
+    fprintf(fp,"\t");
+    sx=sptr[n];
+    switch(sx->type) {
+      case DATACHAR:
         fprintf(fp,"char 0");
         break;
-     case DATASHORT:
+      case DATASHORT:
         fprintf(fp,"short 0");
         break;
-     case DATAINT:
+      case DATAINT:
         fprintf(fp,"int 0");
         break;
-     case DATAFLOAT:
+      case DATAFLOAT:
         fprintf(fp,"float 0");
         break;
-     case DATADOUBLE:
+      case DATADOUBLE:
         fprintf(fp,"double 0");
         break;
-     case DATASTRING:
+      case DATASTRING:
         fprintf(fp,"string 0"); 
     }
     fprintf(fp," %c%s%c=%s;\n",'"',sx->name,'"',cdfsname[n]);
   }
 
   for (n=0;n<anum;n++) {
-   fprintf(fp,"\t");
-     ax=aptr[n];
-     if (ax->dim==0) continue;
-     switch(ax->type) {
-     case DATACHAR:
+    fprintf(fp,"\t");
+    ax=aptr[n];
+    if (ax->dim==0) continue;
+    switch(ax->type) {
+      case DATACHAR:
         fprintf(fp,"char");
         break;
-     case DATASHORT:
+      case DATASHORT:
         fprintf(fp,"short");
         break;
-     case DATAINT:
+      case DATAINT:
         fprintf(fp,"int");
         break;
-     case DATAFLOAT:
+      case DATAFLOAT:
         fprintf(fp,"float");
         break;
-     case DATADOUBLE:
+      case DATADOUBLE:
         fprintf(fp,"double");
         break;
-     case DATASTRING:
+      case DATASTRING:
         fprintf(fp,"string"); 
     }
     fprintf(fp," %d",ax->dim); 
diff --git a/codebase/general/src.bin/dmap/dmaptoskeleton.1.8/doc/dmaptoskeleton.doc.xml b/codebase/general/src.bin/dmap/dmaptoskeleton.1.8/doc/dmaptoskeleton.doc.xml
index 25bf9686c..b6e7d6ced 100644
--- a/codebase/general/src.bin/dmap/dmaptoskeleton.1.8/doc/dmaptoskeleton.doc.xml
+++ b/codebase/general/src.bin/dmap/dmaptoskeleton.1.8/doc/dmaptoskeleton.doc.xml
@@ -5,8 +5,11 @@
 <location>src.bin/dmap/dmaptoskeleton</location>
 <syntax>dmaptoskeleton --help</syntax>
 <syntax>dmaptoskeleton [-vb] <ar>datamap</ar> <ar>skeleton</ar> <ar>map</ar></syntax>
+
 <option><on>--help</on><od>print the help message and exit.</od>
 </option>
+<option><on>--version</on><od>print the RST version number and exit.</od>
+</option>
 <option><on>-vb</on><od>verbose. Log information to the console.</od>
 </option>
 <option><on><ar>datamap</ar></on><od>filename of the DataMap file to scan.</od>
@@ -33,5 +36,4 @@
 <description>Generate the skeleton table "<code>fitacf.skeleton</code>" and mapping table  "<code>fitacf.cdfmap</code>" from the file "<code>20021219.kap.fitacf</code>".</description>
 </example>
 
-
 </binary>
diff --git a/codebase/general/src.bin/dmap/inxdump.1.6/doc/inxdump.doc.xml b/codebase/general/src.bin/dmap/inxdump.1.6/doc/inxdump.doc.xml
index d7281d837..15ea53f1b 100644
--- a/codebase/general/src.bin/dmap/inxdump.1.6/doc/inxdump.doc.xml
+++ b/codebase/general/src.bin/dmap/inxdump.1.6/doc/inxdump.doc.xml
@@ -5,8 +5,11 @@
 <location>src.bin/dmap/inxdump</location>
 <syntax>inxdump --help</syntax>
 <syntax>inxdump [-xtd] [<ar>name</ar>]</syntax>
+
 <option><on>--help</on><od>print the help message and exit.</od>
 </option>
+<option><on>--version</on><od>print the RST version number and exit.</od>
+</option>
 <option><on>-xtd</on><od>the index file is an extended index that contains both start and stop time.</od>
 </option>
 <option><on><ar>name</ar></on><od>filename of the DataMap index file, if this is omitted the document will be read from standard input.</od>
@@ -16,6 +19,7 @@
 <p>Many file formats that use the DataMap format have associated index files. The index file contains a record time and file offset to quickly locate a particular block or record. These index files nearly always have the same format and this utility provides a plain ASCII dump of an index.</p>
 <p>If the "<code>-xtd</code>" option is specified then the index file is assumed to be an extended index and contain both the start time and stop time of each record.</p>
 </description>
+
 <example>
 <command>inxdump test.inx | more</command>
 <description>Dump the index file "<code>test.inx</code>", paginating using the <code>more</code> command.</description>
@@ -26,8 +30,4 @@
 <description>Dump the extended index file "<code>test.inx</code>", and store it in the file "<code>inx.txt</code>"</description>
 </example>
 
-
-
 </binary>
-
-
diff --git a/codebase/general/src.bin/dmap/inxdump.1.6/inxdump.c b/codebase/general/src.bin/dmap/inxdump.1.6/inxdump.c
index dfc5c4eb2..b3411dace 100644
--- a/codebase/general/src.bin/dmap/inxdump.1.6/inxdump.c
+++ b/codebase/general/src.bin/dmap/inxdump.1.6/inxdump.c
@@ -58,6 +58,7 @@ int main (int argc,char *argv[]) {
   int arg;
   unsigned char help=0;
   unsigned char option=0;
+  unsigned char version=0;
   unsigned char startstop=0;
   int st=0;
   double tme[2];
@@ -67,6 +68,7 @@ int main (int argc,char *argv[]) {
 
   OptionAdd(&opt,"-help",'x',&help);
   OptionAdd(&opt,"-option",'x',&option);
+  OptionAdd(&opt,"-version",'x',&version);
   OptionAdd(&opt,"xtd",'x',&startstop);
 
   arg=OptionProcess(1,argc,argv,&opt,rst_opterr);
@@ -85,6 +87,10 @@ int main (int argc,char *argv[]) {
     exit(0);
   }
 
+  if (version==1) {
+    OptionVersion(stdout);
+    exit(0);
+  }
 
   if (arg==argc) fp=stdin;
   else fp=fopen(argv[arg],"r");
diff --git a/codebase/general/src.bin/rfile/index_file.1.4/doc/index_file.doc.xml b/codebase/general/src.bin/rfile/index_file.1.4/doc/index_file.doc.xml
index 272cb80c7..698cfcef3 100644
--- a/codebase/general/src.bin/rfile/index_file.1.4/doc/index_file.doc.xml
+++ b/codebase/general/src.bin/rfile/index_file.1.4/doc/index_file.doc.xml
@@ -5,8 +5,11 @@
 <location>src.bin/rfile/index_file</location>
 <syntax>index_file --help</syntax>
 <syntax>index_file [<ar>name</ar>]</syntax>
+
 <option><on>--help</on><od>print the help message and exit.</od>
 </option>
+<option><on>--version</on><od>print the RST version number and exit.</od>
+</option>
 <option><on><ar>name</ar></on><od>filename of the rFile format file, if this is omitted the file will be read from standard input.</od>
 </option>
 <synopsis><p>Generate an index for a file in the rFile format.</p></synopsis>
@@ -14,12 +17,10 @@
 <description><p>Generates an index of a data file in the rFile data format. The index is written to standard output.</p>
 <p>The index contains the start and end times of each record, together with the file offset of the start of each record.</p>
 </description>
+
 <example>
 <command>index_file test.dat &gt; test.inx</command>
 <description>Generates an index of the data file "<code>test.dat</code>" and stores it in the file "<code>test.inx</code>".</description>
 </example>
 
- 
-
-
 </binary>
diff --git a/codebase/general/src.bin/rfile/index_file.1.4/index_file.c b/codebase/general/src.bin/rfile/index_file.1.4/index_file.c
index d681889b0..649454aff 100644
--- a/codebase/general/src.bin/rfile/index_file.1.4/index_file.c
+++ b/codebase/general/src.bin/rfile/index_file.1.4/index_file.c
@@ -57,11 +57,13 @@ int main(int argc,char *argv[]) {
   void *tptr[2];
   unsigned char help=0;
   unsigned char option=0;
+  unsigned char version=0;
 
  
 
   OptionAdd(&opt,"-help",'x',&help);
   OptionAdd(&opt,"-option",'x',&option);
+  OptionAdd(&opt,"-version",'x',&version);
 
   arg=OptionProcess(1,argc,argv,&opt,rst_opterr);
 
@@ -79,7 +81,10 @@ int main(int argc,char *argv[]) {
     exit(0);
   }
 
-
+  if (version==1) {
+    OptionVersion(stdout);
+    exit(0);
+  }
 
   if (arg<argc) {
     fp=fopen(argv[arg],"r");
diff --git a/codebase/general/src.bin/task/etime.1.8/doc/etime.doc.xml b/codebase/general/src.bin/task/etime.1.8/doc/etime.doc.xml
index b189a7114..e7bd83438 100644
--- a/codebase/general/src.bin/task/etime.1.8/doc/etime.doc.xml
+++ b/codebase/general/src.bin/task/etime.1.8/doc/etime.doc.xml
@@ -5,13 +5,15 @@
 <location>src.bin/task/etime</location>
 <syntax>etime --help</syntax>
 <syntax>etime [-day] [-year] [<ar>name</ar>]</syntax>
+
 <option><on>--help</on><od>print the help message and exit.</od>
 </option>
+<option><on>--version</on><od>print the RST version number and exit.</od>
+</option>
 <option><on>-day</on><od>print second of day, not second of epoch.</od>
 </option>
 <option><on>-year</on><od>print second of year, not second of epoch.</od>
 </option>
-
 <option><on><ar>name</ar></on><od>filename of the ASCII file, if this is omitted the file will be read from standard input.</od>
 </option>
 <synopsis><p>Convert the time in a plain ASCII listing to seconds of epoch or seconds of day.</p></synopsis>
@@ -24,21 +26,18 @@
 <quote>year month day hour minute seconds data...</quote>
 
 <p>The remainder of the line is the record data.</p>
-<p>The program converts the time to the number of seconds from 0:00UT January 1, 1970, or if the "<code>-d</code>" option is specified to the number of seconds from the start of the day.</p>  
+<p>The program converts the time to the number of seconds from 0:00UT January 1, 1970, or if the "<code>-d</code>" option is specified to the number of seconds from the start of the day.</p>
 <p>The converted time followed by the remainder of the record data is written to standard output.</p>
 </description>
 
-
 <example>
 <command>etime data.txt &gt; data.2.txt</command>
 <description>Convert the times in the file "<code>data.txt</code>" to seconds from 0:00UT January 1,1970. The output is written to the file "<code>data.2.txt</code>".</description>
 </example>
+
 <example>
 <command>etime -d data.txt &gt; data.2.txt</command>
 <description>Convert the times in the file "<code>data.txt</code>" to seconds from the start of the day. The output is written to the file "<code>data.2.txt</code>".</description>
 </example>
 
-
-
-
 </binary>
diff --git a/codebase/general/src.bin/task/etime.1.8/etime.c b/codebase/general/src.bin/task/etime.1.8/etime.c
index 30e1c77e0..d4a64ba9b 100644
--- a/codebase/general/src.bin/task/etime.1.8/etime.c
+++ b/codebase/general/src.bin/task/etime.1.8/etime.c
@@ -107,10 +107,12 @@ int main(int argc,char *argv[]) {
   unsigned char rel=0;
   unsigned char help=0;
   unsigned char option=0;
+  unsigned char version=0;
   
  
   OptionAdd(&opt,"-help",'x',&help);
   OptionAdd(&opt,"-option",'x',&option);
+  OptionAdd(&opt,"-version",'x',&version);
   OptionAdd(&opt,"day",'x',&day);
   OptionAdd(&opt,"year",'x',&year);
   OptionAdd(&opt,"rel",'x',&rel);
@@ -137,6 +139,11 @@ int main(int argc,char *argv[]) {
     exit(0);
   }
 
+  if (version==1) {
+    OptionVersion(stdout);
+    exit(0);
+  }
+
   if (exstr !=NULL) extime=strtime(exstr);
   if (stmestr !=NULL) stime=strtime(stmestr);
   if (etmestr !=NULL) etime=strtime(etmestr);
diff --git a/codebase/general/src.bin/task/eval.1.4/doc/eval.doc.xml b/codebase/general/src.bin/task/eval.1.4/doc/eval.doc.xml
index 0d111285a..c54eb252c 100644
--- a/codebase/general/src.bin/task/eval.1.4/doc/eval.doc.xml
+++ b/codebase/general/src.bin/task/eval.1.4/doc/eval.doc.xml
@@ -5,8 +5,11 @@
 <location>src.bin/task/eval</location>
 <syntax>rst_eval --help</syntax>
 <syntax>rst_eval [-c <ar>cast</ar>] [-f <ar>format</ar>] <ar>expr</ar></syntax>
+
 <option><on>--help</on><od>print the help message and exit.</od>
 </option>
+<option><on>--version</on><od>print the RST version number and exit.</od>
+</option>
 <option><on>-c <ar>cast</ar></on><od>force the final calculated value of the expression to be <ar>cast</ar> data type.</od>
 </option>
 <option><on>-f <ar>format</ar></on><od>use the string <ar>format</ar> to format the output text. The string uses the printf syntax. </od>
@@ -18,6 +21,7 @@
 <p>The calculated value is written to standard output</p>
 <p>The expression to evaluate should be quoted.</p>
 </description>
+
 <example>
 <command>rst_eval "2.5*3.12/6"</command>
 <description>Evaluate 2.5*3.12/6.</description>
@@ -28,6 +32,4 @@
 <description>Evaluate 2.3*0.5, convert the result to an integer and print it using the format "<code>%d</code>".</description>
 </example>
 
-
-
 </binary>
diff --git a/codebase/general/src.bin/task/eval.1.4/eval.c b/codebase/general/src.bin/task/eval.1.4/eval.c
index fff5ac805..da461519f 100644
--- a/codebase/general/src.bin/task/eval.1.4/eval.c
+++ b/codebase/general/src.bin/task/eval.1.4/eval.c
@@ -202,6 +202,7 @@ int rst_opterr(char *txt) {
 int main(int argc,char *argv[]) {
   unsigned char help=0;
   unsigned char option=0;
+  unsigned char version=0;
 
   int s;
   double store[2];
@@ -212,6 +213,7 @@ int main(int argc,char *argv[]) {
  
   OptionAdd(&opt,"-help",'x',&help);
   OptionAdd(&opt,"-option",'x',&option);
+  OptionAdd(&opt,"-version",'x',&version);
 
   OptionAdd(&opt,"c",'t',&cast);
   OptionAdd(&opt,"f",'t',&format);
@@ -226,12 +228,16 @@ int main(int argc,char *argv[]) {
     OptionPrintInfo(stdout,hlpstr);
     exit(0);
   }
+
   if (option==1) {
     OptionDump(stdout,&opt);
     exit(0);
   }
 
-
+  if (version==1) {
+    OptionVersion(stdout);
+    exit(0);
+  }
 
   if (arg==argc) {
     OptionPrintInfo(stderr,errstr);
diff --git a/codebase/general/src.bin/task/invtime.1.3/doc/invtime.doc.xml b/codebase/general/src.bin/task/invtime.1.3/doc/invtime.doc.xml
index ae06efb9a..4fced3ddb 100644
--- a/codebase/general/src.bin/task/invtime.1.3/doc/invtime.doc.xml
+++ b/codebase/general/src.bin/task/invtime.1.3/doc/invtime.doc.xml
@@ -6,8 +6,11 @@
 <syntax>invtime --help</syntax>
 <syntax>invtime [-c <ar>columns...</ar>] [<ar>name</ar>]</syntax>
 <syntax>invtime -d -sd <ar>yyyymmdd</ar> [-c <ar>columns...</ar>] [<ar>name</ar>]</syntax>
+
 <option><on>--help</on><od>print the help message and exit.</od>
 </option>
+<option><on>--version</on><od>print the RST version number and exit.</od>
+</option>
 <option><on>-c <ar>columns</ar></on><od>print only the columns given by the comma separated list <ar>columns</ar>.</od>
 </option>
 <option><on>-d</on><od>the time is given as seconds of day.</od>
@@ -18,30 +21,26 @@
 </option>
 <synopsis><p>Convert back from second of epoch or second of day to regular time.</p></synopsis>
 
-
 <description><p>Convert from a time expressed as seconds from 0:00UT January 1, 1970, or seconds from the start of a day, in a text file, back to the full Universal Time.</p>
 <p>The reformatted text file is written to standard output.</p>
 
-
 <p>Each line of the data file should consist of a single record. Entries in the record should be space or tab separated and the first number represent the date and time of the record expressed either as seconds from epoch or seconds from start of day:</p>
 
 <quote>seconds data...</quote>
 
 <p>The remainder of the line is the record data.</p>
-<p>The program converts the time back to a full representation of year, month, day, hour, minute and seconds. if the "<code>-d</code>" option is specified then the "<code>-sd</code>" option can be used to set the start date of the data.</p>  
+<p>The program converts the time back to a full representation of year, month, day, hour, minute and seconds. if the "<code>-d</code>" option is specified then the "<code>-sd</code>" option can be used to set the start date of the data.</p>
 <p>The converted time followed by the remainder of the record data is written to standard output.</p>
 </description>
 
-
 <example>
 <command>invtime data.txt &gt; data.2.txt</command>
 <description>Convert the times in the file "<code>data.txt</code>" to a full reprentation of year, month, day, hour, minute and second. The output is written to the file "<code>data.2.txt</code>".</description>
 </example>
+
 <example>
 <command>invtime -d -sd 20040830 data.txt &gt; data.2.txt</command>
-<description>Convert the times in the file "<code>data.txt</code>" to a full representation of year, month, day, hour, minute, and seconds. The input file is assumed to contain seconds from the start of the day and the date is set to 30th August, 2004.  The output is written to the file "<code>data.2.txt</code>".</description>
+<description>Convert the times in the file "<code>data.txt</code>" to a full representation of year, month, day, hour, minute, and seconds. The input file is assumed to contain seconds from the start of the day and the date is set to 30th August, 2004. The output is written to the file "<code>data.2.txt</code>".</description>
 </example>
 
-
-
 </binary>
diff --git a/codebase/general/src.bin/task/invtime.1.3/invtime.c b/codebase/general/src.bin/task/invtime.1.3/invtime.c
index 781915f92..4b1b18f43 100644
--- a/codebase/general/src.bin/task/invtime.1.3/invtime.c
+++ b/codebase/general/src.bin/task/invtime.1.3/invtime.c
@@ -79,9 +79,11 @@ int main(int argc,char *argv[]) {
   char *vstr=NULL;
   unsigned char help=0;
   unsigned char option=0;
+  unsigned char version=0;
 
   OptionAdd(&opt,"-help",'x',&help);
   OptionAdd(&opt,"-option",'x',&option);
+  OptionAdd(&opt,"-version",'x',&version);
 
   OptionAdd(&opt,"d",'x',&day);
   OptionAdd(&opt,"sd",'t',&dtstr);
@@ -103,6 +105,10 @@ int main(int argc,char *argv[]) {
     exit(0);
   }
 
+  if (version==1) {
+    OptionVersion(stdout);
+    exit(0);
+  }
  
   if (cstr !=NULL) {
     char *tmp;
diff --git a/codebase/general/src.bin/task/ptime.1.5/ptime.c b/codebase/general/src.bin/task/ptime.1.5/ptime.c
index e0153ac12..41f4cabf9 100644
--- a/codebase/general/src.bin/task/ptime.1.5/ptime.c
+++ b/codebase/general/src.bin/task/ptime.1.5/ptime.c
@@ -182,6 +182,7 @@ int main(int argc, char *argv[]) {
 
   unsigned char help=0;
   unsigned char option=0;
+  unsigned char version=0;
   
   char txt[BLEN],buf[BLEN];
   char fmt[BLEN]={"%s\n"};
@@ -200,6 +201,7 @@ int main(int argc, char *argv[]) {
 
   OptionAdd(&opt,"-help",'x',&help);
   OptionAdd(&opt,"-option",'x',&option);
+  OptionAdd(&opt,"-version",'x',&version);
   OptionAdd(&opt,"f",'t',&ufmt);
   OptionAdd(&opt,"d",'t',&dstr);
   
@@ -217,11 +219,17 @@ int main(int argc, char *argv[]) {
     OptionPrintInfo(stdout,hlpstr);
     exit(0);
   }
+
   if (option==1) {
     OptionDump(stdout,&opt);
     exit(0);
   }
 
+  if (version==1) {
+    OptionVersion(stdout);
+    exit(0);
+  }
+
   if (ufmt !=NULL) strcpy(fmt,ufmt);
 
   if (dstr !=NULL) delta=strtime(dstr,&mult);
diff --git a/codebase/general/src.bin/tcpip/buffer_server.1.14/buffer_server.c b/codebase/general/src.bin/tcpip/buffer_server.1.14/buffer_server.c
index e7074c0df..34529b0f5 100644
--- a/codebase/general/src.bin/tcpip/buffer_server.1.14/buffer_server.c
+++ b/codebase/general/src.bin/tcpip/buffer_server.1.14/buffer_server.c
@@ -274,6 +274,7 @@ int main(int argc,char *argv[]) {
  
   unsigned char help=0;
   unsigned char option=0;
+  unsigned char version=0;
 
   int remote_port=0;
   char chost[256];
@@ -294,6 +295,7 @@ int main(int argc,char *argv[]) {
 
   OptionAdd(&opt,"-help",'x',&help);
   OptionAdd(&opt,"-option",'x',&option);
+  OptionAdd(&opt,"-version",'x',&version);
   OptionAdd(&opt,"l",'i',&port);
   OptionAdd(&opt,"f",'t',&file);
   OptionAdd(&opt,"lf",'t',&log);
@@ -313,6 +315,10 @@ int main(int argc,char *argv[]) {
     exit(0);
   }
 
+  if (version==1) {
+    OptionVersion(stdout);
+    exit(0);
+  }
 
   if (argc-arg<2) {
     OptionPrintInfo(stderr,errstr);
diff --git a/codebase/general/src.bin/tcpip/buffer_server.1.14/doc/buffer_server.doc.xml b/codebase/general/src.bin/tcpip/buffer_server.1.14/doc/buffer_server.doc.xml
index 4594322a0..261123147 100644
--- a/codebase/general/src.bin/tcpip/buffer_server.1.14/doc/buffer_server.doc.xml
+++ b/codebase/general/src.bin/tcpip/buffer_server.1.14/doc/buffer_server.doc.xml
@@ -5,37 +5,34 @@
 <location>src.bin/tcpip/buffer_server</location>
 <syntax>buffer_server --help</syntax>
 <syntax>buffer_server [-lf <ar>logname</ar>] [-f <ar>portname</ar>] [-l <ar>lport</ar>] <ar>hostname</ar> <ar>rport</ar></syntax>
+
 <option><on>--help</on><od>print the help message and exit.</od>
 </option>
-
+<option><on>--version</on><od>print the RST version number and exit.</od>
+</option>
 <option><on>-lf <ar>logname</ar></on><od>log connections and information in the file <ar>logname</ar>. By default, connections are recorded in <code>log.rt</code>.</od>
 </option>
-
-<option><on>-f <ar>portname</ar></on><od>record the port number that the server is listening for connections on in the file <ar>portname</ar>. By default, the port is  recorded in <code>port.id</code>.</od>
+<option><on>-f <ar>portname</ar></on><od>record the port number that the server is listening for connections on in the file <ar>portname</ar>. By default, the port is recorded in <code>port.id</code>.</od>
 </option>
-
 <option><on>-l <ar>port</ar></on><od>force the server to listen on the local port number <ar>port</ar>. By default, the server requests a port number from the Operating System.</od></option>
-
-<option><on><ar>host</ar></on><od>hostname or IP number of the system to connect to.</od></option>
-<option><on><ar>rport</ar></on><od>port number to connect to on the server.</od></option>
+<option><on><ar>host</ar></on><od>hostname or IP number of the system to connect to.</od>
+</option>
+<option><on><ar>rport</ar></on><od>port number to connect to on the server.</od>
+</option>
 <synopsis><p>Simple TCP/IP connection relay and buffer.</p></synopsis>
 <description><p>The task is both a TCP/IP client and a server. It receives data from a remote host and then relays it to one or more client tasks.</p> 
 <p>Each connection spawns a new child process that connects to the remote server. As data is received it is buffered and relayed to the client. Once the client disconnects the child process will die.</p>
 <p>The main use for this program is to disguise the origin of a TCP/IP data stream.  Java Applets will not allow connections to be made with any host other than the web server that they originated from. By using the <code>buffer_server</code> task, data from any host can be relayed through the web server.</p>
 </description>
 
-
 <example>
-<command>buffer_server -f port.id -lf log  peanut.jhuapl.edu  1024</command>
+<command>buffer_server -f port.id -lf log peanut.jhuapl.edu 1024</command>
 <description>Connects to the remote host <code>peanut.jhuapl.edu</code> at port 1024 and relay data from a port allocated by the operating system. The port number is recorded in the file "<code>port.id</code>" and logs of all transactions are recorded in the file "<code>log.rt</code>".</description>
 </example>
+
 <example>
-<command>buffer_server  -l 5000 -f port.id -lf log peanut.jhuapl.edu 1200</command>
+<command>buffer_server -l 5000 -f port.id -lf log peanut.jhuapl.edu 1200</command>
 <description>Connects to the remote host <code>peanut.jhuapl.edu</code> at port 1024 and relay data from the port 5000. The port number is recorded in the file "<code>port.id</code>" and logs of all transactions are recorded in the file "<code>log.rt</code>".</description>
 </example>
 
-
-
-
-
 </binary>
diff --git a/codebase/general/src.bin/tcpip/dmapclient.1.8/dmapclient.c b/codebase/general/src.bin/tcpip/dmapclient.1.8/dmapclient.c
index d29a1edd2..7d34d5f12 100644
--- a/codebase/general/src.bin/tcpip/dmapclient.1.8/dmapclient.c
+++ b/codebase/general/src.bin/tcpip/dmapclient.1.8/dmapclient.c
@@ -63,6 +63,7 @@ int main(int argc,char *argv[]) {
   int flag,status,size;
   unsigned char help=0;
   unsigned char option=0;
+  unsigned char version=0;
 
   unsigned char *buffer=NULL;
   unsigned char stream=255;
@@ -78,6 +79,7 @@ int main(int argc,char *argv[]) {
 
   OptionAdd(&opt,"-help",'x',&help);
   OptionAdd(&opt,"-option",'x',&option);
+  OptionAdd(&opt,"-version",'x',&version);
   OptionAdd(&opt,"d",'x',&dflg);
   OptionAdd(&opt,"s",'i',&sval);
 
@@ -97,6 +99,11 @@ int main(int argc,char *argv[]) {
     exit(0);
   }
 
+  if (version==1) {
+    OptionVersion(stdout);
+    exit(0);
+  }
+
   if (argc-arg<2) { 
     OptionPrintInfo(stderr,errstr);
     exit(-1);
diff --git a/codebase/general/src.bin/tcpip/dmapclient.1.8/doc/dmapclient.doc.xml b/codebase/general/src.bin/tcpip/dmapclient.1.8/doc/dmapclient.doc.xml
index 3cb7516d6..cbea96fe2 100644
--- a/codebase/general/src.bin/tcpip/dmapclient.1.8/doc/dmapclient.doc.xml
+++ b/codebase/general/src.bin/tcpip/dmapclient.1.8/doc/dmapclient.doc.xml
@@ -5,23 +5,24 @@
 <location>src.bin/tcpip/dmapclient</location>
 <syntax>dmapclient --help</syntax>
 <syntax>dmapclient [-d] [-s <ar>stream</ar>] <ar>host</ar> <ar>port</ar></syntax>
+
 <option><on>--help</on><od>print the help message and exit.</od>
 </option>
+<option><on>--version</on><od>print the RST version number and exit.</od>
+</option>
 <option><on>-d</on><od>print the data values in the array variables.</od>
 </option>
 <option><on>-s <ar>stream</ar></on><od>for a multiplexed stream, read the stream number given by <ar>stream</ar>. A value of 255 will read all streams</od>
 </option>
 <option><on><ar>host</ar></on><od>hostname or IP address of the system to connect to.</od>
 </option>
-<option><on><ar>port</ar></on><od>port number to connect to on  the system.</od></option>
+<option><on><ar>port</ar></on><od>port number to connect to on the system.</od></option>
 <synopsis><p>Simple client program for a DataMap TCP/IP stream.</p></synopsis>
 <description><p>A Simple diagnostic client program for a DataMap TCP/IP streams.</p>
 <p>The program will connect to a remote server delivering DatMap formatted packets and dump them to the console.</p>
 <p>If the remote server uses multiplexed streams then the "<code>-s</code"> command line option can be used to select the stream.</p>
 </description>
 
-
-
 <example>
 <command>dmapclient peanut.jhuapl.edu 1024</command>
 <description>Connect to the remote host <code>peanut.jhuapl.edu</code> at port 1024.</description>
@@ -32,8 +33,4 @@
 <description>Connect to the remote host <code>peanut.jhuapl.edu</code> at port 1024.Use stream number 1. Print the data values in the array variables.</description>
 </example>
 
-
-
-
-
 </binary>
diff --git a/codebase/general/src.bin/tcpip/rtmultiplex.1.32/doc/rtmultiplex.doc.xml b/codebase/general/src.bin/tcpip/rtmultiplex.1.32/doc/rtmultiplex.doc.xml
index 581b97315..4321a2093 100644
--- a/codebase/general/src.bin/tcpip/rtmultiplex.1.32/doc/rtmultiplex.doc.xml
+++ b/codebase/general/src.bin/tcpip/rtmultiplex.1.32/doc/rtmultiplex.doc.xml
@@ -4,34 +4,27 @@
 <name>rtmultiplex</name>
 <location>src.bin/tcpip/rtmultiplex</location>
 <syntax>rtmultiplex --help</syntax>
-<syntax>rtmultiplex [-vb] [-t <ar>timeout</ar>] [-L <ar>logname</ar>]  [-T <ar>timename</ar>] [-pf <ar>portname</ar>] [-if <ar>pidname</ar>] [-lp <ar>lport</ar>] [-f] <ar>hostnames...</ar> <ar>rports...</ar></syntax>
+<syntax>rtmultiplex [-vb] [-t <ar>timeout</ar>] [-L <ar>logname</ar>] [-T <ar>timename</ar>] [-pf <ar>portname</ar>] [-if <ar>pidname</ar>] [-lp <ar>lport</ar>] [-f] <ar>hostnames...</ar> <ar>rports...</ar></syntax>
+
 <option><on>--help</on><od>print the help message and exit.</od>
 </option>
+<option><on>--version</on><od>print the RST version number and exit.</od>
+</option>
 <option><on>-vb</on><od>verbose. Log information to the console.</od>
 </option>
-
-
 <option><on>-t <ar>timeout</ar></on><od>reset the connection if no packets are received in <ar>timeout</ar> seconds. By default, the timeout is 20 seconds.</od>
 </option>
-
 <option><on>-L <ar>logname</ar></on><od>log connections and information in the file <ar>logname</ar>. By default, connections are recorded in <code>log.rt</code>.</od>
 </option>
-
 <option><on>-T <ar>timename</ar></on><od>log the time that the last packet was received in the file <ar>timename</ar>. By default, the time is recorded in <code>time.rt</code>.</od>
 </option>
-
-<option><on>-pf <ar>portname</ar></on><od>record the port number that the server is listening for connections on in the file <ar>portname</ar>. By default, the port is  recorded in <code>port.id</code>.</od>
+<option><on>-pf <ar>portname</ar></on><od>record the port number that the server is listening for connections on in the file <ar>portname</ar>. By default, the port is recorded in <code>port.id</code>.</od>
 </option>
-
-<option><on>-if <ar>pidname</ar></on><od>record the process Identifier (PID) of the server in the file <ar>pidname</ar>. By default, the PID is  recorded in <code>pid.id</code>.</od>
+<option><on>-if <ar>pidname</ar></on><od>record the process Identifier (PID) of the server in the file <ar>pidname</ar>. By default, the PID is recorded in <code>pid.id</code>.</od>
 </option>
-
-
 <option><on>-lp <ar>lport</ar></on><od>force the server to listen on the local port number <ar>port</ar>. By default, the server requests a port number from the Operating System.</od></option>
-
 <option><on>-f</on><od>allow stream filtering. Each data stream is assigned a numeric identifier.</od>
 </option>
-
 <option><on><ar>hosts</ar></on><od>space separated hostnames or IP numbers of the systems to connect to.</od></option>
 <option><on><ar>rport</ar></on><od>space separated list of port numbers to connect to on the servers.</od></option>
 <synopsis><p>TCP/IP stream mulitplexer.</p></synopsis>
@@ -39,17 +32,14 @@
 <p>Each remote data stream is assigned a stream number based on the position that the server name appears in the command line. The clients connecting to the <code>rtmultiplex</code> task can select the stream they wish to receive by sending a single byte back to the server.</p>
 </description>
 
-
 <example>
-<command>rtmultiplex -f port.id -lf log  peanut.jhuapl.edu 1024 almond.jhuapl.edu 1024</command>
-<description>Connects to the remote host <code>peanut.jhuapl.edu</code> at port 1024, and to host <code>almond.jhuapl.edu</code> at port 1024.  Relay data from a port allocated by the operating system. The port number is recorded in the file "<code>port.id</code>" and logs of all transactions are recorded in the file "<code>log.rt</code>".</description>
+<command>rtmultiplex -f port.id -lf log peanut.jhuapl.edu 1024 almond.jhuapl.edu 1024</command>
+<description>Connects to the remote host <code>peanut.jhuapl.edu</code> at port 1024, and to host <code>almond.jhuapl.edu</code> at port 1024. Relay data from a port allocated by the operating system. The port number is recorded in the file "<code>port.id</code>" and logs of all transactions are recorded in the file "<code>log.rt</code>".</description>
 </example>
+
 <example>
-<command>rtmultiplex  -l 5000 -f port.id -lf log peanut.jhuapl.edu 1200 peanut.jhuapl.edu 1201</command>
+<command>rtmultiplex -l 5000 -f port.id -lf log peanut.jhuapl.edu 1200 peanut.jhuapl.edu 1201</command>
 <description>Connects to the remote host <code>peanut.jhuapl.edu</code> at ports 1200 and 1201. Relay data from the port 5000. The port number is recorded in the file "<code>port.id</code>" and logs of all transactions are recorded in the file "<code>log.rt</code>".</description>
 </example>
 
-
-
-
 </binary>
diff --git a/codebase/general/src.bin/tcpip/rtmultiplex.1.32/rtmultiplex.c b/codebase/general/src.bin/tcpip/rtmultiplex.1.32/rtmultiplex.c
index 7eded5c45..0df61b9c3 100644
--- a/codebase/general/src.bin/tcpip/rtmultiplex.1.32/rtmultiplex.c
+++ b/codebase/general/src.bin/tcpip/rtmultiplex.1.32/rtmultiplex.c
@@ -98,6 +98,7 @@ int main(int argc,char *argv[]) {
   int c;
   unsigned char help=0;
   unsigned char option=0;
+  unsigned char version=0;
 
   char *logstr=NULL;
   char *timestr=NULL;
@@ -123,6 +124,7 @@ int main(int argc,char *argv[]) {
  
   OptionAdd(&opt,"-help",'x',&help);
   OptionAdd(&opt,"-option",'x',&option);
+  OptionAdd(&opt,"-version",'x',&version);
 
   OptionAdd(&opt,"vb",'x',&vb);
   OptionAdd(&opt,"t",'i',&timeout);
@@ -144,11 +146,16 @@ int main(int argc,char *argv[]) {
     OptionPrintInfo(stdout,hlpstr);
     exit(0);
   }
+
   if (option==1) {
     OptionDump(stdout,&opt);
     exit(0);
   }
 
+  if (version==1) {
+    OptionVersion(stdout);
+    exit(0);
+  }
 
   if (argc-arg<2) {
      OptionPrintInfo(stdout,errstr);
diff --git a/codebase/general/src.bin/tcpip/rtpoll.1.15/doc/rtpoll.doc.xml b/codebase/general/src.bin/tcpip/rtpoll.1.15/doc/rtpoll.doc.xml
index 1a7e75be4..4af71f153 100644
--- a/codebase/general/src.bin/tcpip/rtpoll.1.15/doc/rtpoll.doc.xml
+++ b/codebase/general/src.bin/tcpip/rtpoll.1.15/doc/rtpoll.doc.xml
@@ -5,19 +5,17 @@
 <location>src.bin/tcpip/rtpoll</location>
 <syntax>rtpoll --help</syntax>
 <syntax>rtpoll [-L <ar>logname</ar>][-if <ar>pidname</ar>] [-d <ar>pollsec</ar>] [-f <ar>name</ar>] <ar>command</ar></syntax>
+
 <option><on>--help</on><od>print the help message and exit.</od>
 </option>
-
+<option><on>--version</on><od>print the RST version number and exit.</od>
+</option>
 <option><on>-L <ar>logname</ar></on><od>log connections and information in the file <ar>logname</ar>. By default, connections are recorded in <code>log.rt</code>.</od>
 </option>
-
-<option><on>-if <ar>pidname</ar></on><od>record the process Identifier (PID) of the server in the file <ar>pidname</ar>. By default, the PID is  recorded in <code>pid.id</code>.</od>
+<option><on>-if <ar>pidname</ar></on><od>record the process Identifier (PID) of the server in the file <ar>pidname</ar>. By default, the PID is recorded in <code>pid.id</code>.</od>
 </option>
-
-
 <option><on>-d <ar>pollsec</ar></on><od>length of time to wait between polling to see if the data file has been modified, to <ar>pollsec</ar> seconds.</od>
 </option>
-
 <option><on>-f <ar>name</ar></on><od>poll to see if the file <ar>name</ar> has been modified.</od>
 </option>
 <option><on><ar>command</ar></on><od>command to execute if the data file has been modified.</od></option>
@@ -26,12 +24,8 @@
 <p>The file to test is specified by the "<code>-f</code>" option. The "<code>-d</code>" option sets the delay in seconds between tests of this file.</p>
 </description>
 
-
 <example>
-<command>rtpoll  -L /home/rtproc/log  -d 120 -f  /data/rt.dat /home/rtproc/script/doanalysis</command>
+<command>rtpoll -L /home/rtproc/log -d 120 -f /data/rt.dat /home/rtproc/script/doanalysis</command>
 <description>Test the file "<code>/data/rt.dat</code>" every two minutes for changes. If a change occurs, execute the script "<code>/home/rtproc/script/doanalysis</code>". Actions are logged in the file "<code>/home/rtproc/log.<ar>YYYYMMDD</ar></code>", where <ar>YYYYMMDD</ar> is the date.</description></example>
 
-
-
-
 </binary>
diff --git a/codebase/general/src.bin/tcpip/rtpoll.1.15/rtpoll.c b/codebase/general/src.bin/tcpip/rtpoll.1.15/rtpoll.c
index d514eb4b9..6e85f2da4 100644
--- a/codebase/general/src.bin/tcpip/rtpoll.1.15/rtpoll.c
+++ b/codebase/general/src.bin/tcpip/rtpoll.1.15/rtpoll.c
@@ -65,6 +65,7 @@ int main(int argc,char *argv[]) {
   FILE *fp;
   unsigned char help=0;  
   unsigned char option=0;
+  unsigned char version=0;
   
   pid_t pid;
 
@@ -93,6 +94,7 @@ int main(int argc,char *argv[]) {
 
   OptionAdd(&opt,"-help",'x',&help);
   OptionAdd(&opt,"-option",'x',&option);
+  OptionAdd(&opt,"-version",'x',&version);
 
   OptionAdd(&opt,"L",'t',&logstr);
   OptionAdd(&opt,"d",'i',&dtime);
@@ -115,6 +117,11 @@ int main(int argc,char *argv[]) {
     exit(0);
   }
 
+  if (version==1) {
+    OptionVersion(stdout);
+    exit(0);
+  }
+
   if (argc==arg) {
      OptionPrintInfo(stdout,errstr);
      exit(-1);