diff --git a/EduNetworkBuilder/NetworkDevice.cs b/EduNetworkBuilder/NetworkDevice.cs
index 44c587d..489e10b 100644
--- a/EduNetworkBuilder/NetworkDevice.cs
+++ b/EduNetworkBuilder/NetworkDevice.cs
@@ -1234,6 +1234,8 @@ namespace EduNetworkBuilder
 
             }
 
+            if (tPacket.isFinshed()) return;
+
             NetworkCard dNic = null;
             NetworkCard sNic = null;
 
@@ -1450,7 +1452,8 @@ namespace EduNetworkBuilder
                     //
                     nPacket.destIP = new IPAddress(NB.LoopbackIPString);
                 }
-                if (myType == NetworkComponentType.net_hub || myType == NetworkComponentType.net_switch)
+                if (myType == NetworkComponentType.net_hub || myType == NetworkComponentType.net_switch || 
+                    myType == NetworkComponentType.wrouter)
                 {
                     //put mac of management interface on packet
                     //dmac is originating mac
@@ -1521,7 +1524,8 @@ namespace EduNetworkBuilder
                     nPacket.sourceIP = nPacket.destIP;
                     nPacket.TsourceIP = nPacket.destIP;
                     nPacket.destIP = tip;
-                    if (myType == NetworkComponentType.net_hub || myType == NetworkComponentType.net_switch)
+                    if (myType == NetworkComponentType.net_hub || myType == NetworkComponentType.net_switch || 
+                        myType == NetworkComponentType.wrouter)
                     {
                         //put mac of management interface on packet
                         //dmac is originating mac
@@ -1628,7 +1632,7 @@ namespace EduNetworkBuilder
                         return;
                     }
                 }
-                else
+                else if(!tPacket.isFresh)
                 {
                     tPacket.AddMessage(DebugLevel.info, "ERROR!  A packet returned to a machine that we were not expecting it from.");
                     string sIP = "?.?.?.?";
@@ -2072,6 +2076,7 @@ namespace EduNetworkBuilder
                 List<IPAddress> addresses = nc.IPAddressList();
                 if (addresses.Count > 0)
                 {
+                    if (tPacket.TsourceIP == null) tPacket.TsourceIP = tPacket.sourceIP;
                     tPacket.OutboundIP = addresses[0];
                     tPacket.OutboundNic = nc;
                     tPacket.OutboundMAC = nc.MAC;
diff --git a/EduNetworkBuilder/Resources/ReleaseNotes.rtf b/EduNetworkBuilder/Resources/ReleaseNotes.rtf
index 5ad9463..82033bf 100644
--- a/EduNetworkBuilder/Resources/ReleaseNotes.rtf
+++ b/EduNetworkBuilder/Resources/ReleaseNotes.rtf
@@ -1,6 +1,11 @@
 {\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033{\fonttbl{\f0\fnil\fcharset0 Calibri;}}
 {\*\generator Riched20 6.3.9600}\viewkind4\uc1 
-\pard\sa200\sl276\slmult1\f0\fs22\lang9 Version 1.0.22\line Version 1.0.21   08/15/2015\par
+\pard\sa200\sl276\slmult1\f0\fs22\lang9 Version 1.0.22\par
+* Added ssid and keys for wireless links\par
+* Wireless will auto-disconnect if link is too long\par
+* Wireless will auto-connect if ssid and key match, if link is short enough\par
+* Packets will drop on wireless links if distance is too great\par
+* wport has no interface (cannot edit IP address)\line Version 1.0.21   08/15/2015\par
 * Added a microwave and fluorescent light.  They corrupt data when packets run close to them.\par
 * Added some packet corruption puzzles\par
 * Fixed window resize-on-load issue where the help window popped up first, then the builder window resized over to hide the help window. \par