diff --git a/Pepperdash Core/Pepperdash Core/Comm/EventArgs.cs b/Pepperdash Core/Pepperdash Core/Comm/EventArgs.cs
index e9e9f1f..ecf6db8 100644
--- a/Pepperdash Core/Pepperdash Core/Comm/EventArgs.cs	
+++ b/Pepperdash Core/Pepperdash Core/Comm/EventArgs.cs	
@@ -76,6 +76,14 @@ namespace PepperDash.Core
     public class GenericTcpServerCommMethodReceiveTextArgs : EventArgs
     {
         public uint ReceivedFromClientIndex { get; private set; }
+		public ushort ReceivedFromClientIndexShort
+		{
+			get
+			{
+				return (ushort)ReceivedFromClientIndex;
+			}
+		}
+
         public string Text { get; private set; }
 
         public GenericTcpServerCommMethodReceiveTextArgs(string text)
diff --git a/Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs b/Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs
index 6af5d7b..8a6e9fd 100644
--- a/Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs	
+++ b/Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs	
@@ -221,7 +221,12 @@ namespace PepperDash.Core
 
 			Debug.Console(1, this, "Creating new SshClient");
 			ConnectionInfo connectionInfo = new ConnectionInfo(Hostname, Port, Username, pauth, kauth);
-			Client = new SshClient(connectionInfo);
+
+			if (Client == null)
+			{
+				Client = new SshClient(connectionInfo);
+			}
+			Client.ErrorOccurred -= Client_ErrorOccurred;
 			Client.ErrorOccurred += Client_ErrorOccurred;
 
 			//You can do it!
diff --git a/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs b/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs
index 525f32b..b8b715f 100644
--- a/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs	
+++ b/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs	
@@ -163,9 +163,17 @@ namespace PepperDash.Core
 
 		CTimer RetryTimer;
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="address"></param>
+        /// <param name="port"></param>
+        /// <param name="bufferSize"></param>
 		public GenericTcpIpClient(string key, string address, int port, int bufferSize)
 			: base(key)
 		{
+
             Hostname = address;
             Port = port;
             BufferSize = bufferSize;
@@ -190,6 +198,21 @@ namespace PepperDash.Core
             //Client.SocketStatusChange += Client_SocketStatusChange;
 		}
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="key"></param>
+        public GenericTcpIpClient(string key)
+            : base(key)
+        {
+            CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
+            AutoReconnectIntervalMs = 5000;
+            BufferSize = 2000;
+        }
+
+        /// <summary>
+        /// Default constructor for S+
+        /// </summary>
         public GenericTcpIpClient()
 			: base("Uninitialized TcpIpClient")
 		{
@@ -250,8 +273,6 @@ namespace PepperDash.Core
 
             if (Client == null)
             {
-			
-				
                 Client = new TCPClient(Hostname, Port, BufferSize);
                 Client.SocketStatusChange += Client_SocketStatusChange;
             }
diff --git a/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplFileMaster.cs b/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplFileMaster.cs
index 82198c1..7ddaeb3 100644
--- a/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplFileMaster.cs	
+++ b/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplFileMaster.cs	
@@ -77,12 +77,10 @@ namespace PepperDash.Core.JsonToSimpl
 			OnStringChange(ActualFilePath, 0, JsonToSimplConstants.ActualFilePathChange);
 			Debug.Console(1, "Actual JSON file is {0}", ActualFilePath);
 
-			// TODO: pdc-20: added to retrun filename to SIMPL
 			Filename = actualFile.Name;
 			OnStringChange(Filename, 0, JsonToSimplConstants.FilenameResolvedChange);
 			Debug.Console(1, "JSON Filename is {0}", Filename);
 
-			// TODO: pdc-20: added to return the file path to SIMPL
 			FilePathName = string.Format(@"{0}\", actualFile.DirectoryName);
 			OnStringChange(FilePathName, 0, JsonToSimplConstants.FilePathResolvedChange);
 			Debug.Console(1, "JSON File Path is {0}", FilePathName);
diff --git a/Pepperdash Core/Pepperdash Core/Properties/UpdateAssemblyVersion.ps1 b/Pepperdash Core/Pepperdash Core/Properties/UpdateAssemblyVersion.ps1
index 46392b3..f1c6c38 100644
--- a/Pepperdash Core/Pepperdash Core/Properties/UpdateAssemblyVersion.ps1	
+++ b/Pepperdash Core/Pepperdash Core/Properties/UpdateAssemblyVersion.ps1	
@@ -24,6 +24,7 @@ function Update-AllAssemblyInfoFiles ( $version )
 $r= [System.Text.RegularExpressions.Regex]::Match($args[0], "^\d+\.\d+\.\d+$");
 if ($r.Success)
 {
+    echo "Updating Assembly Version...";
     Update-AllAssemblyInfoFiles $args[0];
 }
 else