diff --git a/English.lproj/Preferences.nib/info.nib b/English.lproj/Preferences.nib/info.nib
index 7c74c67..13a7790 100755
--- a/English.lproj/Preferences.nib/info.nib
+++ b/English.lproj/Preferences.nib/info.nib
@@ -19,7 +19,6 @@
 	</array>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>793</integer>
 		<integer>6</integer>
 	</array>
 	<key>IBSystem Version</key>
diff --git a/English.lproj/Preferences.nib/keyedobjects.nib b/English.lproj/Preferences.nib/keyedobjects.nib
index f24b487..9a4c80f 100755
Binary files a/English.lproj/Preferences.nib/keyedobjects.nib and b/English.lproj/Preferences.nib/keyedobjects.nib differ
diff --git a/MainController.h b/MainController.h
index b03349d..ae6f7fd 100755
--- a/MainController.h
+++ b/MainController.h
@@ -82,4 +82,6 @@
 - (void)setupHotKeys;
 - (void)closePreferences;
 
+- (void)showCurrentTrackInfo;
+
 @end
diff --git a/MainController.m b/MainController.m
index 4c2ed2c..67ce65d 100755
--- a/MainController.m
+++ b/MainController.m
@@ -14,7 +14,6 @@ @interface MainController(Private)
 - (ITMTRemote *)loadRemote;
 - (void)timerUpdate;
 - (void)setLatestSongIdentifier:(NSString *)newIdentifier;
-- (void)showCurrentTrackInfo;
 - (void)applicationLaunched:(NSNotification *)note;
 - (void)applicationTerminated:(NSNotification *)note;
 @end
diff --git a/NetworkController.h b/NetworkController.h
index 662e519..1f1f799 100755
--- a/NetworkController.h
+++ b/NetworkController.h
@@ -24,7 +24,7 @@
     NSMutableArray *remoteServices;
     
     NSConnection *serverConnection, *clientConnection;
-    NSSocketPort *serverPort, *clientPort;
+    NSSocketPort *clientPort;
     NSString *remoteHost;
     BOOL serverOn, clientConnected, connectedToServer;
     NSData *serverPass, *clientPass;
diff --git a/NetworkController.m b/NetworkController.m
index 24e8264..49b8321 100755
--- a/NetworkController.m
+++ b/NetworkController.m
@@ -69,17 +69,20 @@ - (void)setServerStatus:(BOOL)status
 {
     if (!serverOn && status) {
         NSString *name = [[NSUserDefaults standardUserDefaults] stringForKey:@"sharedPlayerName"];
+        NSPort *serverPort;
         unsigned char buffer;
         NSData *fullPass;
         //Turn on
         NS_DURING
-            serverPort = [[NSSocketPort alloc] initWithTCPPort:SERVER_PORT];
+            serverPort = [[[NSSocketPort alloc] initWithTCPPort:SERVER_PORT] autorelease];
             serverConnection = [[NSConnection alloc] initWithReceivePort:serverPort
                                                      sendPort:serverPort];
-            [serverConnection setRootObject:[[NetworkObject alloc] init]];
+            clientProxy = [[NetworkObject alloc] init];
+            [serverConnection setRootObject:[clientProxy autorelease]];
             [serverConnection registerName:@"ITMTPlayerHost"];
         NS_HANDLER
             [[serverConnection rootObject] release];
+            [serverConnection setRootObject:nil];
             [serverConnection release];
             [serverPort release];
             ITDebugLog(@"Error starting server!");
@@ -108,8 +111,8 @@ - (void)setServerStatus:(BOOL)status
         //Turn off
         [service stop];
         [serverConnection registerName:nil];
-        [[serverConnection rootObject] release];
         [serverConnection release];
+        [clientProxy release];
         ITDebugLog(@"Stopped server.");
         serverOn = NO;
     }
diff --git a/NetworkObject.m b/NetworkObject.m
index 32bbbc8..4473970 100755
--- a/NetworkObject.m
+++ b/NetworkObject.m
@@ -35,10 +35,11 @@ - (id)init
 
 - (ITMTRemote *)remote
 {
-    if (_authenticated)
+    if (_authenticated) {
         return [[MainController sharedController] currentRemote];
-    else
+    } else {
         return nil;
+    }
 }
 
 - (NSString *)serverName
diff --git a/libValidate.a b/libValidate.a
index b921fb5..40db57b 100755
Binary files a/libValidate.a and b/libValidate.a differ