diff --git a/Tether.xcodeproj/project.pbxproj b/Tether.xcodeproj/project.pbxproj
index 851b361..60ba542 100644
--- a/Tether.xcodeproj/project.pbxproj
+++ b/Tether.xcodeproj/project.pbxproj
@@ -42,9 +42,9 @@
 		D9D810FF182F6794003DCCBB /* libusbmuxd.c in Sources */ = {isa = PBXBuildFile; fileRef = D9D810FA182F6794003DCCBB /* libusbmuxd.c */; };
 		D9D81100182F6794003DCCBB /* sock_stuff.c in Sources */ = {isa = PBXBuildFile; fileRef = D9D810FB182F6794003DCCBB /* sock_stuff.c */; };
 		D9D81101182F6794003DCCBB /* sock_stuff.h in Headers */ = {isa = PBXBuildFile; fileRef = D9D810FC182F6794003DCCBB /* sock_stuff.h */; };
-		D9D81104182F8303003DCCBB /* liblibusbmuxd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D90E32AA182F629600A6F642 /* liblibusbmuxd.a */; };
-		D9D81105182F83CF003DCCBB /* liblibcnary.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D90E32D3182F655600A6F642 /* liblibcnary.a */; };
-		D9D81106182F83D2003DCCBB /* liblibplist.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D90E32A0182F626000A6F642 /* liblibplist.a */; };
+		D9D81104182F8303003DCCBB /* libusbmuxd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D90E32AA182F629600A6F642 /* libusbmuxd.a */; };
+		D9D81105182F83CF003DCCBB /* libcnary.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D90E32D3182F655600A6F642 /* libcnary.a */; };
+		D9D81106182F83D2003DCCBB /* libplist.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D90E32A0182F626000A6F642 /* libplist.a */; };
 		D9D81107182F83DD003DCCBB /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D90E32CD182F653300A6F642 /* libxml2.dylib */; };
 		D9D8110A182F8B80003DCCBB /* USBMuxClient.m in Sources */ = {isa = PBXBuildFile; fileRef = D9D81109182F8B80003DCCBB /* USBMuxClient.m */; };
 /* End PBXBuildFile section */
@@ -92,8 +92,8 @@
 		D90E3294182F18CC00A6F642 /* CBDeviceWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CBDeviceWindowController.h; sourceTree = "<group>"; };
 		D90E3295182F18CC00A6F642 /* CBDeviceWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CBDeviceWindowController.m; sourceTree = "<group>"; };
 		D90E3296182F18CC00A6F642 /* CBDeviceWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CBDeviceWindowController.xib; sourceTree = "<group>"; };
-		D90E32A0182F626000A6F642 /* liblibplist.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = liblibplist.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		D90E32AA182F629600A6F642 /* liblibusbmuxd.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = liblibusbmuxd.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		D90E32A0182F626000A6F642 /* libplist.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libplist.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		D90E32AA182F629600A6F642 /* libusbmuxd.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libusbmuxd.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		D90E32B2182F638800A6F642 /* base64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = base64.c; path = Submodules/libplist/src/base64.c; sourceTree = "<group>"; };
 		D90E32B3182F638800A6F642 /* base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = base64.h; path = Submodules/libplist/src/base64.h; sourceTree = "<group>"; };
 		D90E32B4182F638800A6F642 /* bplist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bplist.c; path = Submodules/libplist/src/bplist.c; sourceTree = "<group>"; };
@@ -108,7 +108,7 @@
 		D90E32BD182F638800A6F642 /* ptrarray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ptrarray.h; path = Submodules/libplist/src/ptrarray.h; sourceTree = "<group>"; };
 		D90E32BE182F638800A6F642 /* xplist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = xplist.c; path = Submodules/libplist/src/xplist.c; sourceTree = "<group>"; };
 		D90E32CD182F653300A6F642 /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = usr/lib/libxml2.dylib; sourceTree = SDKROOT; };
-		D90E32D3182F655600A6F642 /* liblibcnary.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = liblibcnary.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		D90E32D3182F655600A6F642 /* libcnary.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libcnary.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		D90E32D8182F663A00A6F642 /* iterator.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = iterator.c; path = Submodules/libplist/libcnary/iterator.c; sourceTree = "<group>"; };
 		D90E32D9182F663A00A6F642 /* list.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = list.c; path = Submodules/libplist/libcnary/list.c; sourceTree = "<group>"; };
 		D90E32DA182F663A00A6F642 /* node_iterator.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = node_iterator.c; path = Submodules/libplist/libcnary/node_iterator.c; sourceTree = "<group>"; };
@@ -135,9 +135,9 @@
 			files = (
 				D931A611183012D600593FF9 /* Security.framework in Frameworks */,
 				D9D81107182F83DD003DCCBB /* libxml2.dylib in Frameworks */,
-				D9D81106182F83D2003DCCBB /* liblibplist.a in Frameworks */,
-				D9D81105182F83CF003DCCBB /* liblibcnary.a in Frameworks */,
-				D9D81104182F8303003DCCBB /* liblibusbmuxd.a in Frameworks */,
+				D9D81106182F83D2003DCCBB /* libplist.a in Frameworks */,
+				D9D81105182F83CF003DCCBB /* libcnary.a in Frameworks */,
+				D9D81104182F8303003DCCBB /* libusbmuxd.a in Frameworks */,
 				D90E3259182F07DC00A6F642 /* Cocoa.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -181,9 +181,9 @@
 			isa = PBXGroup;
 			children = (
 				D90E3255182F07DC00A6F642 /* Tether.app */,
-				D90E32A0182F626000A6F642 /* liblibplist.a */,
-				D90E32AA182F629600A6F642 /* liblibusbmuxd.a */,
-				D90E32D3182F655600A6F642 /* liblibcnary.a */,
+				D90E32A0182F626000A6F642 /* libplist.a */,
+				D90E32AA182F629600A6F642 /* libusbmuxd.a */,
+				D90E32D3182F655600A6F642 /* libcnary.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -373,7 +373,7 @@
 			);
 			name = libplist;
 			productName = libplist;
-			productReference = D90E32A0182F626000A6F642 /* liblibplist.a */;
+			productReference = D90E32A0182F626000A6F642 /* libplist.a */;
 			productType = "com.apple.product-type.library.static";
 		};
 		D90E32A9182F629600A6F642 /* libusbmuxd */ = {
@@ -391,7 +391,7 @@
 			);
 			name = libusbmuxd;
 			productName = libusbmuxd;
-			productReference = D90E32AA182F629600A6F642 /* liblibusbmuxd.a */;
+			productReference = D90E32AA182F629600A6F642 /* libusbmuxd.a */;
 			productType = "com.apple.product-type.library.static";
 		};
 		D90E32D2182F655500A6F642 /* libcnary */ = {
@@ -408,7 +408,7 @@
 			);
 			name = libcnary;
 			productName = libcnary;
-			productReference = D90E32D3182F655600A6F642 /* liblibcnary.a */;
+			productReference = D90E32D3182F655600A6F642 /* libcnary.a */;
 			productType = "com.apple.product-type.library.static";
 		};
 /* End PBXNativeTarget section */
@@ -663,7 +663,7 @@
 		D90E32A2182F626000A6F642 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				EXECUTABLE_PREFIX = lib;
+				EXECUTABLE_PREFIX = "";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -682,7 +682,7 @@
 		D90E32A3182F626000A6F642 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				EXECUTABLE_PREFIX = lib;
+				EXECUTABLE_PREFIX = "";
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
@@ -697,7 +697,7 @@
 		D90E32AC182F629600A6F642 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				EXECUTABLE_PREFIX = lib;
+				EXECUTABLE_PREFIX = "";
 				GCC_PREPROCESSOR_DEFINITIONS = HAVE_PLIST;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -712,7 +712,7 @@
 		D90E32AD182F629600A6F642 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				EXECUTABLE_PREFIX = lib;
+				EXECUTABLE_PREFIX = "";
 				GCC_PREPROCESSOR_DEFINITIONS = HAVE_PLIST;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -727,7 +727,7 @@
 		D90E32D5182F655600A6F642 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				EXECUTABLE_PREFIX = lib;
+				EXECUTABLE_PREFIX = "";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -744,7 +744,7 @@
 		D90E32D6182F655600A6F642 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				EXECUTABLE_PREFIX = lib;
+				EXECUTABLE_PREFIX = "";
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
diff --git a/Tether/CBDeviceWindowController.h b/Tether/CBDeviceWindowController.h
index 39d0953..2c18548 100644
--- a/Tether/CBDeviceWindowController.h
+++ b/Tether/CBDeviceWindowController.h
@@ -10,13 +10,15 @@
 #import "USBMuxClient.h"
 #import "GCDAsyncSocket.h"
 
-@interface CBDeviceWindowController : NSWindowController <NSTableViewDataSource, NSTableViewDelegate, USBMuxClientDelegate>
+@interface CBDeviceWindowController : NSWindowController <NSTableViewDataSource, NSTableViewDelegate, USBMuxClientDelegate, GCDAsyncSocketDelegate>
 
 @property (strong) IBOutlet NSTableView *deviceTableView;
 @property (nonatomic, strong) NSMutableOrderedSet *devices;
 @property (strong) IBOutlet NSButton *connectButton;
 @property (strong) IBOutlet NSButton *refreshButton;
 @property (nonatomic, strong) GCDAsyncSocket *socket;
+@property (strong) IBOutlet NSTextField *remotePortField;
+@property (strong) IBOutlet NSTextField *localPortField;
 
 - (IBAction)connectButtonPressed:(id)sender;
 - (IBAction)refreshButtonPressed:(id)sender;
diff --git a/Tether/CBDeviceWindowController.m b/Tether/CBDeviceWindowController.m
index fa3428d..24ccf93 100644
--- a/Tether/CBDeviceWindowController.m
+++ b/Tether/CBDeviceWindowController.m
@@ -9,12 +9,15 @@
 #import "CBDeviceWindowController.h"
 #import "USBMuxClient.h"
 
+const static uint16_t kDefaultLocalPortNumber = 8000;
+const static uint16_t kDefaultRemotePortNumber = 8123;
+
 @interface CBDeviceWindowController ()
 
 @end
 
 @implementation CBDeviceWindowController
-@synthesize devices, deviceTableView, socket;
+@synthesize devices, deviceTableView, socket, remotePortField, localPortField;
 
 
 - (void) device:(USBMuxDevice *)device statusDidChange:(USBDeviceStatus)deviceStatus {
@@ -47,6 +50,7 @@ - (void)windowDidLoad
     self.deviceTableView.delegate = self;
     // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
     [USBMuxClient sharedClient].delegate = self;
+    [self performSelector:@selector(refreshButtonPressed:) withObject:nil afterDelay:0.1]; // for whatever reason 
 }
 
 
@@ -88,16 +92,29 @@ - (IBAction)connectButtonPressed:(id)sender {
         return;
     }
     USBMuxDevice *device = [devices objectAtIndex:self.deviceTableView.selectedRow];
-    NSUInteger port = 8123;
-    [USBMuxClient connectDevice:device port:port completionCallback:^(BOOL success, NSError *error) {
-        NSLog(@"connecting %@ on port %lu", device.udid, (unsigned long)port);
+    uint16_t remotePort = kDefaultRemotePortNumber;
+    uint16_t remotePortFieldValue = (uint16_t)remotePortField.integerValue;
+    if (remotePortFieldValue > 0) {
+        remotePort = remotePortFieldValue;
+    }
+    
+    [USBMuxClient connectDevice:device port:remotePort completionCallback:^(BOOL success, NSError *error) {
+        if (success) {
+            NSLog(@"connected %@ on remote port %d", device.udid, remotePort);
+        } else {
+            NSLog(@"error connecting to remote port %d", remotePort);
+        }
     }];
     self.socket = [[GCDAsyncSocket alloc] initWithDelegate:self delegateQueue:dispatch_get_main_queue()];
     NSError *error = nil;
-    uint16_t portNumber = 8000;
-    [socket acceptOnPort:portNumber error:&error];
+    uint16_t localPort = kDefaultLocalPortNumber;
+    uint16_t localPortFieldValue = (uint16_t)localPortField.integerValue;
+    if (localPortFieldValue > 0) {
+        localPort = localPortFieldValue;
+    }
+    [socket acceptOnPort:localPort error:&error];
     if (error) {
-        NSLog(@"Error listening on port %d", portNumber);
+        NSLog(@"Error listening on port %d", localPort);
     }
 }
 
diff --git a/Tether/CBDeviceWindowController.xib b/Tether/CBDeviceWindowController.xib
index 279588b..eb7d1df 100644
--- a/Tether/CBDeviceWindowController.xib
+++ b/Tether/CBDeviceWindowController.xib
@@ -8,7 +8,9 @@
             <connections>
                 <outlet property="connectButton" destination="OsL-u8-g7s" id="Ujg-kf-iwt"/>
                 <outlet property="deviceTableView" destination="2UG-KQ-Ahb" id="bCD-gD-HP9"/>
+                <outlet property="localPortField" destination="ZXH-Mq-bEb" id="q8X-lI-cMy"/>
                 <outlet property="refreshButton" destination="sue-YU-LfJ" id="AEc-DC-phG"/>
+                <outlet property="remotePortField" destination="oUG-u6-zx0" id="Cdz-MN-0tF"/>
                 <outlet property="window" destination="1" id="3"/>
             </connections>
         </customObject>
@@ -17,21 +19,21 @@
         <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" wantsToBeColor="NO" animationBehavior="default" id="1">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="196" y="240" width="513" height="289"/>
+            <rect key="contentRect" x="196" y="240" width="595" height="305"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1440" height="878"/>
             <view key="contentView" id="2">
-                <rect key="frame" x="0.0" y="0.0" width="513" height="289"/>
+                <rect key="frame" x="0.0" y="0.0" width="595" height="305"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Cej-YJ-dtF">
-                        <rect key="frame" x="-1" y="41" width="515" height="249"/>
+                        <rect key="frame" x="-1" y="41" width="597" height="265"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <clipView key="contentView" id="fnM-fe-MaB">
-                            <rect key="frame" x="1" y="17" width="513" height="231"/>
+                            <rect key="frame" x="1" y="17" width="595" height="247"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" headerView="R7b-KU-fqG" viewBased="YES" id="2UG-KQ-Ahb">
-                                    <rect key="frame" x="0.0" y="0.0" width="513" height="231"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="595" height="247"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -70,7 +72,7 @@
                                                 </tableCellView>
                                             </prototypeCellViews>
                                         </tableColumn>
-                                        <tableColumn identifier="UDIDCell" width="385" minWidth="40" maxWidth="1000" id="q3L-CP-uGt">
+                                        <tableColumn identifier="UDIDCell" width="467" minWidth="40" maxWidth="1000" id="q3L-CP-uGt">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="UDID">
                                                 <font key="font" metaFont="smallSystem"/>
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -84,11 +86,11 @@
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                             <prototypeCellViews>
                                                 <tableCellView identifier="UDIDCell" id="SiD-V0-EF3">
-                                                    <rect key="frame" x="126" y="1" width="385" height="17"/>
+                                                    <rect key="frame" x="126" y="1" width="467" height="17"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>
                                                         <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="HET-AV-aYg">
-                                                            <rect key="frame" x="0.0" y="0.0" width="385" height="17"/>
+                                                            <rect key="frame" x="0.0" y="0.0" width="467" height="17"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="wQI-jZ-QLe">
                                                                 <font key="font" metaFont="system"/>
@@ -117,13 +119,16 @@
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                         <tableHeaderView key="headerView" id="R7b-KU-fqG">
-                            <rect key="frame" x="0.0" y="0.0" width="513" height="17"/>
+                            <rect key="frame" x="0.0" y="0.0" width="595" height="17"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
                     </scrollView>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="OsL-u8-g7s">
                         <rect key="frame" x="4" y="3" width="92" height="32"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="80" id="WTd-dC-wwi"/>
+                        </constraints>
                         <buttonCell key="cell" type="push" title="Connect" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="71s-Z2-XgI">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -133,7 +138,7 @@
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sue-YU-LfJ">
-                        <rect key="frame" x="422" y="3" width="87" height="32"/>
+                        <rect key="frame" x="504" y="3" width="87" height="32"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="push" title="Refresh" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="3FU-29-kNz">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -144,16 +149,18 @@
                         </connections>
                     </button>
                     <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZXH-Mq-bEb">
-                        <rect key="frame" x="98" y="9" width="70" height="22"/>
+                        <rect key="frame" x="172" y="9" width="70" height="22"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <constraints>
-                            <constraint firstAttribute="width" constant="70" id="1nB-yY-4rv"/>
+                            <constraint firstAttribute="width" constant="70" id="GnF-iE-gb3"/>
                         </constraints>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="Local Port" drawsBackground="YES" id="DLV-Zo-zSC">
-                            <numberFormatter key="formatter" formatterBehavior="default10_4" positiveFormat="#,##0.###" negativeFormat="#,##0.###" numberStyle="decimal" minimumIntegerDigits="1" maximumIntegerDigits="309" minimumFractionDigits="0" maximumFractionDigits="3" id="CCU-xj-aGA">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="8000" drawsBackground="YES" id="DLV-Zo-zSC">
+                            <numberFormatter key="formatter" formatterBehavior="default10_4" positiveFormat="#,##0.###" negativeFormat="#,##0.###" localizesFormat="NO" minimumIntegerDigits="1" maximumIntegerDigits="309" minimumFractionDigits="0" maximumFractionDigits="3" id="CCU-xj-aGA">
                                 <real key="roundingIncrement" value="0.0"/>
+                                <real key="minimum" value="1"/>
+                                <real key="maximum" value="65535"/>
                                 <metadata>
-                                    <bool key="localizesFormat" value="YES"/>
+                                    <bool key="localizesFormat" value="NO"/>
                                 </metadata>
                             </numberFormatter>
                             <font key="font" metaFont="system"/>
@@ -162,16 +169,18 @@
                         </textFieldCell>
                     </textField>
                     <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="oUG-u6-zx0">
-                        <rect key="frame" x="176" y="9" width="86" height="22"/>
+                        <rect key="frame" x="340" y="9" width="86" height="22"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <constraints>
-                            <constraint firstAttribute="width" constant="86" id="0dm-cS-kDd"/>
+                            <constraint firstAttribute="width" constant="86" id="Qmd-z4-BKC"/>
                         </constraints>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="Remote Port" drawsBackground="YES" id="XdH-Rr-36G">
-                            <numberFormatter key="formatter" formatterBehavior="default10_4" positiveFormat="#,##0.###" negativeFormat="#,##0.###" numberStyle="decimal" minimumIntegerDigits="1" maximumIntegerDigits="309" minimumFractionDigits="0" maximumFractionDigits="3" id="tcq-YS-yxJ">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="8123" drawsBackground="YES" id="XdH-Rr-36G">
+                            <numberFormatter key="formatter" formatterBehavior="default10_4" positiveFormat="#,##0.###" negativeFormat="#,##0.###" localizesFormat="NO" numberStyle="decimal" minimumIntegerDigits="1" maximumIntegerDigits="309" minimumFractionDigits="0" maximumFractionDigits="3" id="tcq-YS-yxJ">
                                 <real key="roundingIncrement" value="0.0"/>
+                                <real key="minimum" value="1"/>
+                                <real key="maximum" value="65535"/>
                                 <metadata>
-                                    <bool key="localizesFormat" value="YES"/>
+                                    <bool key="localizesFormat" value="NO"/>
                                 </metadata>
                             </numberFormatter>
                             <font key="font" metaFont="system"/>
@@ -179,20 +188,43 @@
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="pdZ-J3-sBb">
+                        <rect key="frame" x="96" y="12" width="70" height="17"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Local Port:" id="r3D-Xw-u8p">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dgl-Rc-5Df">
+                        <rect key="frame" x="248" y="12" width="86" height="17"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Remote Port:" id="dHi-sF-BnW">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
                 </subviews>
                 <constraints>
+                    <constraint firstItem="pdZ-J3-sBb" firstAttribute="baseline" secondItem="dgl-Rc-5Df" secondAttribute="baseline" id="6cQ-4r-SWd"/>
                     <constraint firstAttribute="trailing" secondItem="sue-YU-LfJ" secondAttribute="trailing" constant="10" id="81p-rh-BfH"/>
+                    <constraint firstItem="ZXH-Mq-bEb" firstAttribute="centerY" secondItem="pdZ-J3-sBb" secondAttribute="centerY" id="F2e-10-dsS"/>
+                    <constraint firstItem="oUG-u6-zx0" firstAttribute="leading" secondItem="dgl-Rc-5Df" secondAttribute="trailing" constant="8" symbolic="YES" id="FIq-lF-1zY"/>
                     <constraint firstItem="OsL-u8-g7s" firstAttribute="leading" secondItem="2" secondAttribute="leading" constant="10" id="Gbg-dv-Vqa"/>
                     <constraint firstItem="sue-YU-LfJ" firstAttribute="baseline" secondItem="OsL-u8-g7s" secondAttribute="baseline" id="Ins-WT-elu"/>
-                    <constraint firstItem="oUG-u6-zx0" firstAttribute="leading" secondItem="ZXH-Mq-bEb" secondAttribute="trailing" constant="8" symbolic="YES" id="LrO-Ak-Azn"/>
-                    <constraint firstItem="ZXH-Mq-bEb" firstAttribute="top" secondItem="OsL-u8-g7s" secondAttribute="top" id="ROw-Sx-KqU"/>
+                    <constraint firstItem="dgl-Rc-5Df" firstAttribute="leading" secondItem="ZXH-Mq-bEb" secondAttribute="trailing" constant="8" symbolic="YES" id="N6b-0m-Dld"/>
+                    <constraint firstItem="pdZ-J3-sBb" firstAttribute="leading" secondItem="OsL-u8-g7s" secondAttribute="trailing" constant="8" symbolic="YES" id="UD2-nc-xMS"/>
                     <constraint firstAttribute="bottom" secondItem="OsL-u8-g7s" secondAttribute="bottom" constant="10" id="Ulh-c1-6xT"/>
-                    <constraint firstItem="ZXH-Mq-bEb" firstAttribute="baseline" secondItem="oUG-u6-zx0" secondAttribute="baseline" id="UvH-Xd-X98"/>
-                    <constraint firstItem="ZXH-Mq-bEb" firstAttribute="leading" secondItem="OsL-u8-g7s" secondAttribute="trailing" constant="8" symbolic="YES" id="X4b-Ze-zGY"/>
                     <constraint firstItem="Cej-YJ-dtF" firstAttribute="top" secondItem="2" secondAttribute="top" constant="-1" id="jGF-P8-91b"/>
                     <constraint firstAttribute="trailing" secondItem="Cej-YJ-dtF" secondAttribute="trailing" constant="-1" id="jwC-6k-K9y"/>
                     <constraint firstItem="OsL-u8-g7s" firstAttribute="top" secondItem="Cej-YJ-dtF" secondAttribute="bottom" constant="10" id="nQV-9a-icg"/>
                     <constraint firstItem="Cej-YJ-dtF" firstAttribute="leading" secondItem="2" secondAttribute="leading" constant="-1" id="oRX-2N-lMc"/>
+                    <constraint firstItem="sue-YU-LfJ" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="oUG-u6-zx0" secondAttribute="trailing" constant="84" id="r3e-gY-HTf"/>
+                    <constraint firstItem="ZXH-Mq-bEb" firstAttribute="leading" secondItem="pdZ-J3-sBb" secondAttribute="trailing" constant="8" symbolic="YES" id="t6I-r6-z3Q"/>
+                    <constraint firstItem="ZXH-Mq-bEb" firstAttribute="top" secondItem="OsL-u8-g7s" secondAttribute="top" id="tvZ-2h-FkZ"/>
+                    <constraint firstItem="ZXH-Mq-bEb" firstAttribute="baseline" secondItem="oUG-u6-zx0" secondAttribute="baseline" id="yQk-Sm-mI6"/>
                 </constraints>
             </view>
             <connections>