diff --git a/CLZ Builds/PepperDash_Core.clz b/CLZ Builds/PepperDash_Core.clz
index 786d8f8..da067cd 100644
Binary files a/CLZ Builds/PepperDash_Core.clz and b/CLZ Builds/PepperDash_Core.clz differ
diff --git a/CLZ Builds/PepperDash_Core.dll b/CLZ Builds/PepperDash_Core.dll
index 808a2f5..dbd207a 100644
Binary files a/CLZ Builds/PepperDash_Core.dll and b/CLZ Builds/PepperDash_Core.dll differ
diff --git a/Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs b/Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs
index 797bfdd..681ecfc 100644
--- a/Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs	
+++ b/Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs	
@@ -217,7 +217,7 @@ namespace PepperDash.Core
 			//{
 				if (Client != null)
 				{
-					Debug.Console(2, this, "Cleaning up disconnected client");
+					Debug.Console(1, this, "Cleaning up disconnected client");
 					Client.ErrorOccurred -= Client_ErrorOccurred;
 					KillStream();
 					
@@ -229,7 +229,7 @@ namespace PepperDash.Core
 					//TheStream = null;
 				}
 
-				Debug.Console(2, this, "Creating new SshClient");
+				Debug.Console(1, this, "Creating new SshClient");
 				ConnectionInfo connectionInfo = new ConnectionInfo(Hostname, Port, Username, pauth, kauth);
 				Client = new SshClient(connectionInfo);
 				Client.ErrorOccurred += Client_ErrorOccurred;
diff --git a/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs b/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs
index 5635e33..4e0f871 100644
--- a/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs	
+++ b/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs	
@@ -234,9 +234,8 @@ namespace PepperDash.Core
                 Client = new TCPClient(Hostname, Port, BufferSize);
                 Client.SocketStatusChange += Client_SocketStatusChange;
             }
-
-			Client.ConnectToServerAsync(null);
 			DisconnectCalledByUser = false;
+			Client.ConnectToServerAsync(ConnectToServerCallback); // (null);
 		}
 
 		public void Disconnect()
@@ -258,6 +257,7 @@ namespace PepperDash.Core
 
 		void ConnectToServerCallback(TCPClient c)
 		{
+			Debug.Console(1, this, "Server connection result: {0}", c.ClientStatus);
 			if (c.ClientStatus != SocketStatus.SOCKET_STATUS_CONNECTED)
 				WaitAndTryReconnect();
 		}
@@ -266,7 +266,7 @@ namespace PepperDash.Core
 		{
             DisconnectClient();
 
-			Debug.Console(2, "Attempting reconnect, status={0}", Client.ClientStatus);
+			Debug.Console(1, "Attempting reconnect, status={0}", Client.ClientStatus);
             if(!DisconnectCalledByUser)
                 RetryTimer = new CTimer(o => { Client.ConnectToServerAsync(ConnectToServerCallback); }, AutoReconnectIntervalMs);
 		}
@@ -326,7 +326,7 @@ namespace PepperDash.Core
 
 		void Client_SocketStatusChange(TCPClient client, SocketStatus clientSocketStatus)
 		{
-			Debug.Console(2, this, "Socket status change {0} ({1})", clientSocketStatus, ClientStatusText);
+			Debug.Console(1, this, "Socket status change {0} ({1})", clientSocketStatus, ClientStatusText);
 			if (client.ClientStatus != SocketStatus.SOCKET_STATUS_CONNECTED && !DisconnectCalledByUser && AutoReconnect)
 				WaitAndTryReconnect();
 
diff --git a/Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs b/Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs
index 124c3f8..49bb1c0 100644
--- a/Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs	
+++ b/Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs	
@@ -4,4 +4,4 @@
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Pepperdash_Core")]
 [assembly: AssemblyCopyright("Copyright © PepperDash 2016")]
-[assembly: AssemblyVersion("1.0.6.*")]
+[assembly: AssemblyVersion("1.0.7.*")]