diff --git a/WSJT-X_Users_Guide.docx b/WSJT-X_Users_Guide.docx
index ee5376d0e..ac3fc4625 100644
Binary files a/WSJT-X_Users_Guide.docx and b/WSJT-X_Users_Guide.docx differ
diff --git a/WSJT-X_Users_Guide_Full.docx b/WSJT-X_Users_Guide_Full.docx
deleted file mode 100644
index 331eb3d60..000000000
Binary files a/WSJT-X_Users_Guide_Full.docx and /dev/null differ
diff --git a/devsetup.ui b/devsetup.ui
index 29729ccac..672b40217 100644
--- a/devsetup.ui
+++ b/devsetup.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>503</width>
+    <width>548</width>
     <height>463</height>
    </rect>
   </property>
@@ -2411,56 +2411,56 @@
   </layout>
  </widget>
  <tabstops>
-  <tabstop>macro1</tabstop>
-  <tabstop>macro2</tabstop>
-  <tabstop>macro3</tabstop>
-  <tabstop>macro4</tabstop>
-  <tabstop>macro5</tabstop>
-  <tabstop>macro6</tabstop>
-  <tabstop>macro7</tabstop>
-  <tabstop>macro8</tabstop>
-  <tabstop>macro9</tabstop>
-  <tabstop>macro10</tabstop>
-  <tabstop>f1</tabstop>
-  <tabstop>f2</tabstop>
-  <tabstop>f3</tabstop>
-  <tabstop>f4</tabstop>
-  <tabstop>f5</tabstop>
-  <tabstop>f6</tabstop>
-  <tabstop>f7</tabstop>
-  <tabstop>f8</tabstop>
-  <tabstop>f9</tabstop>
-  <tabstop>f10</tabstop>
-  <tabstop>f11</tabstop>
-  <tabstop>f12</tabstop>
+  <tabstop>myCallEntry</tabstop>
+  <tabstop>myGridEntry</tabstop>
+  <tabstop>pttMethodComboBox</tabstop>
+  <tabstop>pttComboBox</tabstop>
+  <tabstop>idIntSpinBox</tabstop>
+  <tabstop>cbID73</tabstop>
+  <tabstop>cbPSKReporter</tabstop>
+  <tabstop>cbEnableCAT</tabstop>
+  <tabstop>rigComboBox</tabstop>
+  <tabstop>catPortComboBox</tabstop>
+  <tabstop>dataBitsComboBox</tabstop>
+  <tabstop>serialRateComboBox</tabstop>
+  <tabstop>cbDTRoff</tabstop>
+  <tabstop>stopBitsComboBox</tabstop>
+  <tabstop>handshakeComboBox</tabstop>
+  <tabstop>rbData</tabstop>
+  <tabstop>rbMic</tabstop>
+  <tabstop>testCATButton</tabstop>
+  <tabstop>testPTTButton</tabstop>
+  <tabstop>comboBoxSndIn</tabstop>
+  <tabstop>comboBoxSndOut</tabstop>
+  <tabstop>saveDirEntry</tabstop>
   <tabstop>f13</tabstop>
   <tabstop>f14</tabstop>
   <tabstop>f15</tabstop>
   <tabstop>f16</tabstop>
-  <tabstop>myGridEntry</tabstop>
+  <tabstop>macro2</tabstop>
   <tabstop>buttonBox</tabstop>
-  <tabstop>cbPSKReporter</tabstop>
-  <tabstop>idIntSpinBox</tabstop>
-  <tabstop>cbID73</tabstop>
+  <tabstop>macro7</tabstop>
+  <tabstop>macro5</tabstop>
+  <tabstop>macro6</tabstop>
   <tabstop>ioTabWidget</tabstop>
-  <tabstop>saveDirEntry</tabstop>
-  <tabstop>comboBoxSndOut</tabstop>
-  <tabstop>pttComboBox</tabstop>
-  <tabstop>myCallEntry</tabstop>
-  <tabstop>pttMethodComboBox</tabstop>
-  <tabstop>comboBoxSndIn</tabstop>
-  <tabstop>catPortComboBox</tabstop>
-  <tabstop>cbEnableCAT</tabstop>
-  <tabstop>rigComboBox</tabstop>
-  <tabstop>dataBitsComboBox</tabstop>
-  <tabstop>stopBitsComboBox</tabstop>
-  <tabstop>serialRateComboBox</tabstop>
-  <tabstop>testCATButton</tabstop>
-  <tabstop>handshakeComboBox</tabstop>
-  <tabstop>testPTTButton</tabstop>
-  <tabstop>cbDTRoff</tabstop>
-  <tabstop>rbData</tabstop>
-  <tabstop>rbMic</tabstop>
+  <tabstop>f12</tabstop>
+  <tabstop>f11</tabstop>
+  <tabstop>macro4</tabstop>
+  <tabstop>macro1</tabstop>
+  <tabstop>macro3</tabstop>
+  <tabstop>f10</tabstop>
+  <tabstop>macro10</tabstop>
+  <tabstop>macro8</tabstop>
+  <tabstop>macro9</tabstop>
+  <tabstop>f1</tabstop>
+  <tabstop>f4</tabstop>
+  <tabstop>f2</tabstop>
+  <tabstop>f8</tabstop>
+  <tabstop>f5</tabstop>
+  <tabstop>f9</tabstop>
+  <tabstop>f3</tabstop>
+  <tabstop>f6</tabstop>
+  <tabstop>f7</tabstop>
  </tabstops>
  <resources/>
  <connections>
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 541019df0..89d78e90a 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,4 +1,4 @@
-//---------------------------------------------------------------- MainWindow
+//--------------------------------------------------------------- MainWindow
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include "devsetup.h"
diff --git a/wsjtx.iss b/wsjtx.iss
index a4d2b7553..dc750ddd4 100644
--- a/wsjtx.iss
+++ b/wsjtx.iss
@@ -1,6 +1,6 @@
 [Setup]
 AppName=wsjtx
-AppVerName=wsjtx Version 0.95 r3226
+AppVerName=wsjtx Version 0.95 r3229
 AppCopyright=Copyright (C) 2001-2013 by Joe Taylor, K1JT
 DefaultDirName=c:\wsjtx
 DefaultGroupName=wsjtx
@@ -8,16 +8,15 @@ DefaultGroupName=wsjtx
 [Files]
 Source: "c:\Users\joe\wsjt\wsjtx_install\wsjtx.exe";         DestDir: "{app}"
 Source: "c:\Users\joe\wsjt\wsjtx_install\jt9.exe";           DestDir: "{app}"
-Source: "c:\Users\joe\wsjt\wsjtx_install\rigctl.exe";        DestDir: "{app}"
 Source: "c:\Users\joe\wsjt\wsjtx_install\wsjt.ico";          DestDir: "{app}"
 Source: "c:\Users\joe\wsjt\wsjtx_install\afmhot.dat";        DestDir: "{app}";
 Source: "c:\Users\joe\wsjt\wsjtx_install\blue.dat";          DestDir: "{app}";
 Source: "c:\Users\joe\wsjt\wsjtx_install\CALL3.TXT";         DestDir: "{app}";  Flags: onlyifdoesntexist
 Source: "c:\Users\joe\wsjt\QtSupport\*.dll";                 DestDir: "{app}";  Flags: onlyifdoesntexist
-Source: "c:\Users\joe\wsjt\wsjtx_install\shortcuts.txt";     DestDir: "{app}"
-Source: "c:\Users\joe\wsjt\wsjtx_install\mouse_commands.txt"; DestDir: "{app}"
-
-Source: "c:\Users\joe\wsjt\wsjtx_install\save\Samples\130228_2158.wav";   DestDir: "{app}\save\Samples";
+Source: "c:\Users\joe\wsjt\wsjtx\shortcuts.txt";             DestDir: "{app}"
+Source: "c:\Users\joe\wsjt\wsjtx\mouse_commands.txt";        DestDir: "{app}"
+Source: "c:\Users\joe\wsjt\wsjtx\WSJT-X_Users_Guide.pdf";    DestDir: "{app}"
+Source: "c:\Users\joe\wsjt\wsjtx_install\save\Samples\130426_0027.wav";   DestDir: "{app}\save\Samples";
 
 [Icons]
 Name: "{group}\wsjtx";        Filename: "{app}\wsjtx.exe";   WorkingDir: {app}; IconFilename: {app}\wsjt.ico