diff --git a/MacOSX/AppController.m b/MacOSX/AppController.m
index 20f3d067..2594a148 100644
--- a/MacOSX/AppController.m
+++ b/MacOSX/AppController.m
@@ -103,7 +103,12 @@ NSString *FQPrefScreenModeKey = @"ScreenMode";
 }
 
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
-    [launcherWindow makeKeyAndOrderFront:self];
+	if ([arguments argument:@"-nolauncher"] != nil) {
+		[arguments removeArgument:@"-nolauncher"];
+		[self launchQuake:self];
+	} else {
+		[launcherWindow makeKeyAndOrderFront:self];
+	}
 }
 
 - (IBAction)changeScreenMode:(id)sender {
diff --git a/MacOSX/QuakeArguments.h b/MacOSX/QuakeArguments.h
index 999243ed..ffba1f37 100644
--- a/MacOSX/QuakeArguments.h
+++ b/MacOSX/QuakeArguments.h
@@ -33,6 +33,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 - (void)addArgument:(NSString *)arg withValue:(NSString *)value;
 
 - (QuakeArgument *)argument:(NSString *)name;
+- (void)removeArgument:(NSString *)arg;
 
 - (int)count;
 - (void)setArguments:(char **)args;
diff --git a/MacOSX/QuakeArguments.m b/MacOSX/QuakeArguments.m
index ee21dd68..71e4f0b6 100644
--- a/MacOSX/QuakeArguments.m
+++ b/MacOSX/QuakeArguments.m
@@ -24,7 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 @implementation QuakeArguments
 
 - (id)init {
-    
     self = [super init];
     if (!self)
         return nil;
@@ -34,7 +33,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 }
 
 - (id)initWithArguments:(char **)argv count:(int)argc {
-
     int i;
     NSString *next;
     NSString *current;
@@ -68,7 +66,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 }
 
 - (void)parseArguments:(NSString *)args {
-
     int i;
     unichar c;
     unichar p = ' ';
@@ -141,7 +138,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 }
 
 - (void)addArgument:(NSString *)name {
-
     QuakeArgument *argument = [[QuakeArgument alloc] initWithArgument:name];
     [quakeArgs addObject:argument];
     
@@ -149,15 +145,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 }
 
 - (void)addArgument:(NSString *)name withValue:(NSString *)value {
-
     QuakeArgument *argument = [[QuakeArgument alloc] initWithArgument:name andValue:value];
     [quakeArgs addObject:argument];
     
     [argument release];
 }
 
+- (void)removeArgument:(NSString *)arg {
+	[quakeArgs removeObject:arg];
+}
+
 - (QuakeArgument *)argument:(NSString *)name {
-    
     NSEnumerator *enumerator = [quakeArgs objectEnumerator];
     QuakeArgument *argument;
 
@@ -170,7 +168,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 }
 
 - (int)count {
-
     int c = 0;
 
     NSEnumerator *enumerator = [quakeArgs objectEnumerator];
@@ -186,7 +183,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 }
 
 - (void)setArguments:(char **)args {
-
     int i = 0;
     
     NSEnumerator *enumerator = [quakeArgs objectEnumerator];
@@ -201,7 +197,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 }
 
 - (NSString *)description {
-    
     int i;
     NSMutableString *buffer = [[NSMutableString alloc] init];
 
@@ -221,8 +216,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
     return buffer;
 }
 
-- (void) dealloc
-{
+- (void) dealloc {
     [quakeArgs release];
     [super dealloc];
 }
diff --git a/MacOSX/QuakeSpasm.xcodeproj/kristian.pbxuser b/MacOSX/QuakeSpasm.xcodeproj/kristian.pbxuser
deleted file mode 100644
index e0ed3a26..00000000
--- a/MacOSX/QuakeSpasm.xcodeproj/kristian.pbxuser
+++ /dev/null
@@ -1,518 +0,0 @@
-// !$*UTF8*$!
-{
-	089C165DFE840E0CC02AAC07 /* English */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1287, 643}}";
-			sepNavSelRange = "{294, 0}";
-			sepNavVisRange = "{0, 294}";
-		};
-	};
-	29B97313FDCFA39411CA2CEA /* Project object */ = {
-		activeArchitecturePreference = i386;
-		activeBuildConfigurationName = Debug;
-		activeExecutable = 4847CD3D12057F05000B560F /* QuakeSpasm */;
-		activeSDKPreference = macosx10.5;
-		activeTarget = 8D1107260486CEB800E47090 /* QuakeSpasm */;
-		addToTargets = (
-			8D1107260486CEB800E47090 /* QuakeSpasm */,
-		);
-		breakpoints = (
-		);
-		codeSenseManager = 4847CD5412057F2A000B560F /* Code sense */;
-		executables = (
-			4847CD3D12057F05000B560F /* QuakeSpasm */,
-		);
-		perUserDictionary = {
-			PBXConfiguration.PBXFileTableDataSource3.PBXExecutablesDataSource = {
-				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
-				PBXFileTableDataSourceColumnSortingKey = PBXExecutablesDataSource_NameID;
-				PBXFileTableDataSourceColumnWidthsKey = (
-					22,
-					300,
-					1117.58349609375,
-				);
-				PBXFileTableDataSourceColumnsKey = (
-					PBXExecutablesDataSource_ActiveFlagID,
-					PBXExecutablesDataSource_NameID,
-					PBXExecutablesDataSource_CommentsID,
-				);
-			};
-			PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = {
-				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
-				PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
-				PBXFileTableDataSourceColumnWidthsKey = (
-					20,
-					1020,
-					20,
-					48,
-					43,
-					43,
-					20,
-				);
-				PBXFileTableDataSourceColumnsKey = (
-					PBXFileDataSource_FiletypeID,
-					PBXFileDataSource_Filename_ColumnID,
-					PBXFileDataSource_Built_ColumnID,
-					PBXFileDataSource_ObjectSize_ColumnID,
-					PBXFileDataSource_Errors_ColumnID,
-					PBXFileDataSource_Warnings_ColumnID,
-					PBXFileDataSource_Target_ColumnID,
-				);
-			};
-			PBXConfiguration.PBXTargetDataSource.PBXTargetDataSource = {
-				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
-				PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
-				PBXFileTableDataSourceColumnWidthsKey = (
-					20,
-					1069,
-					60,
-					20,
-					48.16259765625,
-					43,
-					43,
-				);
-				PBXFileTableDataSourceColumnsKey = (
-					PBXFileDataSource_FiletypeID,
-					PBXFileDataSource_Filename_ColumnID,
-					PBXTargetDataSource_PrimaryAttribute,
-					PBXFileDataSource_Built_ColumnID,
-					PBXFileDataSource_ObjectSize_ColumnID,
-					PBXFileDataSource_Errors_ColumnID,
-					PBXFileDataSource_Warnings_ColumnID,
-				);
-			};
-			PBXPerProjectTemplateStateSaveDate = 303155361;
-			PBXWorkspaceStateSaveDate = 303155361;
-		};
-		perUserProjectItems = {
-			48134A1C12102F680015BF15 /* PBXTextBookmark */ = 48134A1C12102F680015BF15 /* PBXTextBookmark */;
-			48134A1D12102F680015BF15 /* PBXTextBookmark */ = 48134A1D12102F680015BF15 /* PBXTextBookmark */;
-			48134A1E12102F680015BF15 /* PBXTextBookmark */ = 48134A1E12102F680015BF15 /* PBXTextBookmark */;
-			48134A3312102F7F0015BF15 /* PBXTextBookmark */ = 48134A3312102F7F0015BF15 /* PBXTextBookmark */;
-			48821E14120DF1150008EE50 /* PBXTextBookmark */ = 48821E14120DF1150008EE50 /* PBXTextBookmark */;
-			48821E15120DF1150008EE50 /* PBXTextBookmark */ = 48821E15120DF1150008EE50 /* PBXTextBookmark */;
-			48821E16120DF1150008EE50 /* PBXTextBookmark */ = 48821E16120DF1150008EE50 /* PBXTextBookmark */;
-			488AC38A1211C8DE00A5038A /* PBXTextBookmark */ = 488AC38A1211C8DE00A5038A /* PBXTextBookmark */;
-			4890A5541205C1FF00452753 /* PBXTextBookmark */ = 4890A5541205C1FF00452753 /* PBXTextBookmark */;
-			4890A5751205D04300452753 /* PBXTextBookmark */ = 4890A5751205D04300452753 /* PBXTextBookmark */;
-			4890A5761205D04300452753 /* PBXTextBookmark */ = 4890A5761205D04300452753 /* PBXTextBookmark */;
-			4890A5D41205D58300452753 /* PBXTextBookmark */ = 4890A5D41205D58300452753 /* PBXTextBookmark */;
-			4890A5D51205D58300452753 /* PBXTextBookmark */ = 4890A5D51205D58300452753 /* PBXTextBookmark */;
-			4890A5DC1205D59F00452753 /* PBXTextBookmark */ = 4890A5DC1205D59F00452753 /* PBXTextBookmark */;
-			4890A5F91205EA8A00452753 /* PBXTextBookmark */ = 4890A5F91205EA8A00452753 /* PBXTextBookmark */;
-			4890A5FA1205EA8A00452753 /* PBXTextBookmark */ = 4890A5FA1205EA8A00452753 /* PBXTextBookmark */;
-			4890A5FB1205EA8A00452753 /* PBXTextBookmark */ = 4890A5FB1205EA8A00452753 /* PBXTextBookmark */;
-			4890A5FC1205EA8A00452753 /* PBXTextBookmark */ = 4890A5FC1205EA8A00452753 /* PBXTextBookmark */;
-			4890A5FD1205EA8A00452753 /* PlistBookmark */ = 4890A5FD1205EA8A00452753 /* PlistBookmark */;
-		};
-		sourceControlManager = 4847CD5312057F2A000B560F /* Source Control */;
-		userBuildSettings = {
-		};
-	};
-	32CA4F630368D1EE00C91783 /* QuakeSpasm_Prefix.pch */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1374, 570}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{0, 795}";
-		};
-	};
-	48134A1412102F400015BF15 /* net_bsd.c */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1408, 1157}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{0, 925}";
-		};
-	};
-	48134A1512102F400015BF15 /* net_defs.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1198, 3328}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{0, 882}";
-		};
-	};
-	48134A1612102F400015BF15 /* net_udp.c */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1408, 5785}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{0, 1128}";
-		};
-	};
-	48134A1C12102F680015BF15 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 48728D290D3004A80004D61B /* net_dgrm.h */;
-		name = "net_dgrm.h: 30";
-		rLen = 16;
-		rLoc = 973;
-		rType = 0;
-		vrLen = 1137;
-		vrLoc = 283;
-	};
-	48134A1D12102F680015BF15 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 48134A1612102F400015BF15 /* net_udp.c */;
-		name = "net_udp.c: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 1128;
-		vrLoc = 0;
-	};
-	48134A1E12102F680015BF15 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 48134A1412102F400015BF15 /* net_bsd.c */;
-		name = "net_bsd.c: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 925;
-		vrLoc = 0;
-	};
-	48134A3312102F7F0015BF15 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 48134A1512102F400015BF15 /* net_defs.h */;
-		name = "net_defs.h: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 997;
-		vrLoc = 0;
-	};
-	48243B130D33F01A00C29F8F /* main_sdl.c */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1411, 2314}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{3146, 1082}";
-		};
-	};
-	4834895D120597F7004184BC /* dsa_pub.pem */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1287, 643}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{0, 1178}";
-		};
-	};
-	4834895F120598A7004184BC /* appcast.xml */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1517, 570}}";
-			sepNavSelRange = "{278, 0}";
-			sepNavVisRange = "{0, 919}";
-			sepNavWindowFrame = "{{15, 465}, {750, 558}}";
-		};
-	};
-	483A781D0D2EEA5400CB2E4C /* sbar.c */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1411, 16848}}";
-			sepNavSelRange = "{639, 0}";
-			sepNavVisRange = "{0, 1513}";
-		};
-	};
-	483A78360D2EEA6D00CB2E4C /* in_sdl.c */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1287, 5408}}";
-			sepNavSelRange = "{4367, 19}";
-			sepNavVisRange = "{0, 1329}";
-		};
-	};
-	483A78370D2EEA6D00CB2E4C /* keys.c */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1411, 12493}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{11094, 861}";
-		};
-	};
-	4847CD3D12057F05000B560F /* QuakeSpasm */ = {
-		isa = PBXExecutable;
-		activeArgIndices = (
-			YES,
-		);
-		argumentStrings = (
-			"-basedir /Applications/Quake",
-		);
-		autoAttachOnCrash = 1;
-		breakpointsEnabled = 1;
-		configStateDict = {
-		};
-		customDataFormattersEnabled = 1;
-		dataTipCustomDataFormattersEnabled = 1;
-		dataTipShowTypeColumn = 1;
-		dataTipSortType = 0;
-		debuggerPlugin = GDBDebugging;
-		disassemblyDisplayState = 0;
-		dylibVariantSuffix = "";
-		enableDebugStr = 1;
-		environmentEntries = (
-		);
-		executableSystemSymbolLevel = 0;
-		executableUserSymbolLevel = 0;
-		libgmallocEnabled = 0;
-		name = QuakeSpasm;
-		savedGlobals = {
-		};
-		showTypeColumn = 0;
-		sourceDirectories = (
-		);
-		variableFormatDictionary = {
-		};
-	};
-	4847CD5312057F2A000B560F /* Source Control */ = {
-		isa = PBXSourceControlManager;
-		fallbackIsa = XCSourceControlManager;
-		isSCMEnabled = 0;
-		scmConfiguration = {
-			repositoryNamesForRoots = {
-				"" = "";
-			};
-		};
-	};
-	4847CD5412057F2A000B560F /* Code sense */ = {
-		isa = PBXCodeSenseManager;
-		indexTemplatePath = "";
-	};
-	48728D280D3004A70004D61B /* net_dgrm.c */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1168, 18395}}";
-			sepNavSelRange = "{33893, 16}";
-			sepNavVisRange = "{33461, 481}";
-		};
-	};
-	48728D290D3004A80004D61B /* net_dgrm.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1408, 546}}";
-			sepNavSelRange = "{973, 16}";
-			sepNavVisRange = "{283, 1137}";
-		};
-	};
-	487C0A5B0DA94A0700A49FF5 /* net_sdlnet.c */ = {
-		isa = PBXFileReference;
-		fileEncoding = 4;
-		lastKnownFileType = sourcecode.c.c;
-		name = net_sdlnet.c;
-		path = /Users/kristian/Documents/Code/XCode/QuakeSpasm/Quake/net_sdlnet.c;
-		sourceTree = "<absolute>";
-	};
-	48821E14120DF1150008EE50 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 4890A5E71205D6D400452753 /* rnotes.html */;
-		name = "rnotes.html: 14";
-		rLen = 0;
-		rLoc = 417;
-		rType = 0;
-		vrLen = 648;
-		vrLoc = 0;
-	};
-	48821E15120DF1150008EE50 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 487C0A5B0DA94A0700A49FF5 /* net_sdlnet.c */;
-		name = "net_sdlnet.c: 363";
-		rLen = 0;
-		rLoc = 7706;
-		rType = 0;
-		vrLen = 789;
-		vrLoc = 7487;
-	};
-	48821E16120DF1150008EE50 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 48728D280D3004A70004D61B /* net_dgrm.c */;
-		name = "net_dgrm.c: 1437";
-		rLen = 16;
-		rLoc = 33893;
-		rType = 0;
-		vrLen = 481;
-		vrLoc = 33461;
-	};
-	488AC38A1211C8DE00A5038A /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 48134A1512102F400015BF15 /* net_defs.h */;
-		name = "net_defs.h: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 882;
-		vrLoc = 0;
-	};
-	4890A4601205A27B00452753 /* SUUpdaterDelegate.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1374, 570}}";
-			sepNavSelRange = "{1051, 0}";
-			sepNavVisRange = "{0, 1195}";
-		};
-	};
-	4890A4611205A27B00452753 /* SUUpdaterDelegate.m */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1619, 858}}";
-			sepNavSelRange = "{2035, 0}";
-			sepNavVisRange = "{270, 480}";
-		};
-	};
-	4890A5541205C1FF00452753 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 32CA4F630368D1EE00C91783 /* QuakeSpasm_Prefix.pch */;
-		name = "QuakeSpasm_Prefix.pch: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 795;
-		vrLoc = 0;
-	};
-	4890A5751205D04300452753 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 48C85E3A0D3AD10E00797678 /* QuakeArgument.m */;
-		name = "QuakeArgument.m: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 1132;
-		vrLoc = 0;
-	};
-	4890A5761205D04300452753 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 4890A4601205A27B00452753 /* SUUpdaterDelegate.h */;
-		name = "SUUpdaterDelegate.h: 29";
-		rLen = 0;
-		rLoc = 1051;
-		rType = 0;
-		vrLen = 1195;
-		vrLoc = 0;
-	};
-	4890A5D01205D55700452753 /* UpdateButton.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1374, 547}}";
-			sepNavSelRange = "{210, 0}";
-			sepNavVisRange = "{0, 218}";
-		};
-	};
-	4890A5D11205D55700452753 /* UpdateButton.m */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1374, 570}}";
-			sepNavSelRange = "{203, 0}";
-			sepNavVisRange = "{0, 312}";
-		};
-	};
-	4890A5D41205D58300452753 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 4890A4611205A27B00452753 /* SUUpdaterDelegate.m */;
-		name = "SUUpdaterDelegate.m: 44";
-		rLen = 0;
-		rLoc = 1546;
-		rType = 0;
-		vrLen = 1313;
-		vrLoc = 809;
-	};
-	4890A5D51205D58300452753 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 4890A5D11205D55700452753 /* UpdateButton.m */;
-		name = "UpdateButton.m: 14";
-		rLen = 0;
-		rLoc = 203;
-		rType = 0;
-		vrLen = 312;
-		vrLoc = 0;
-	};
-	4890A5DC1205D59F00452753 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 4890A5D01205D55700452753 /* UpdateButton.h */;
-		name = "UpdateButton.h: 14";
-		rLen = 0;
-		rLoc = 210;
-		rType = 0;
-		vrLen = 218;
-		vrLoc = 0;
-	};
-	4890A5E61205D6D400452753 /* rnotes.css */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1374, 2808}}";
-			sepNavSelRange = "{3056, 0}";
-			sepNavVisRange = "{2718, 599}";
-		};
-	};
-	4890A5E71205D6D400452753 /* rnotes.html */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1168, 465}}";
-			sepNavSelRange = "{417, 0}";
-			sepNavVisRange = "{0, 648}";
-		};
-	};
-	4890A5F91205EA8A00452753 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 48B9E7A50D340BEA0001CACF /* AppController.h */;
-		name = "AppController.h: 39";
-		rLen = 0;
-		rLoc = 1200;
-		rType = 0;
-		vrLen = 1299;
-		vrLoc = 42;
-	};
-	4890A5FA1205EA8A00452753 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 48B9E7A60D340BEA0001CACF /* AppController.m */;
-		name = "AppController.m: 107";
-		rLen = 0;
-		rLoc = 3365;
-		rType = 0;
-		vrLen = 1542;
-		vrLoc = 3756;
-	};
-	4890A5FB1205EA8A00452753 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 4890A5E61205D6D400452753 /* rnotes.css */;
-		name = "rnotes.css: 185";
-		rLen = 0;
-		rLoc = 3056;
-		rType = 0;
-		vrLen = 599;
-		vrLoc = 2718;
-	};
-	4890A5FC1205EA8A00452753 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 4834895F120598A7004184BC /* appcast.xml */;
-		name = "appcast.xml: 5";
-		rLen = 0;
-		rLoc = 278;
-		rType = 0;
-		vrLen = 919;
-		vrLoc = 0;
-	};
-	4890A5FD1205EA8A00452753 /* PlistBookmark */ = {
-		isa = PlistBookmark;
-		fRef = 8D1107310486CEB800E47090 /* Info.plist */;
-		fallbackIsa = PBXBookmark;
-		isK = 0;
-		kPath = (
-		);
-		name = /Users/kristian/Documents/Code/XCode/QuakeSpasm/MacOSX/Info.plist;
-		rLen = 0;
-		rLoc = 9223372036854775808;
-	};
-	48B9E7A50D340BEA0001CACF /* AppController.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1374, 598}}";
-			sepNavSelRange = "{1200, 0}";
-			sepNavVisRange = "{42, 1299}";
-		};
-	};
-	48B9E7A60D340BEA0001CACF /* AppController.m */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1374, 2197}}";
-			sepNavSelRange = "{3365, 0}";
-			sepNavVisRange = "{3756, 1542}";
-		};
-	};
-	48C85E3A0D3AD10E00797678 /* QuakeArgument.m */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1374, 949}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{0, 1132}";
-		};
-	};
-	8D1107260486CEB800E47090 /* QuakeSpasm */ = {
-		activeExec = 0;
-		executables = (
-			4847CD3D12057F05000B560F /* QuakeSpasm */,
-		);
-	};
-	8D1107310486CEB800E47090 /* Info.plist */ = {
-		uiCtxt = {
-			sepNavWindowFrame = "{{15, 465}, {750, 558}}";
-		};
-	};
-}
diff --git a/MacOSX/QuakeSpasm.xcodeproj/kristian.perspectivev3 b/MacOSX/QuakeSpasm.xcodeproj/kristian.perspectivev3
index 2a24b6aa..1b461b33 100644
--- a/MacOSX/QuakeSpasm.xcodeproj/kristian.perspectivev3
+++ b/MacOSX/QuakeSpasm.xcodeproj/kristian.perspectivev3
@@ -195,26 +195,7 @@
 	<key>Name</key>
 	<string>All-In-One</string>
 	<key>Notifications</key>
-	<array>
-		<dict>
-			<key>XCObserverAutoDisconnectKey</key>
-			<true/>
-			<key>XCObserverDefintionKey</key>
-			<dict/>
-			<key>XCObserverFactoryKey</key>
-			<string>XCPerspectivesSpecificationIdentifier</string>
-			<key>XCObserverGUIDKey</key>
-			<string>XCObserverProjectIdentifier</string>
-			<key>XCObserverNotificationKey</key>
-			<string>PBXStatusBuildStateMessageNotification</string>
-			<key>XCObserverTargetKey</key>
-			<string>XCMainBuildResultsModuleGUID</string>
-			<key>XCObserverTriggerKey</key>
-			<string>awakenModuleWithObserver:</string>
-			<key>XCObserverValidationKey</key>
-			<dict/>
-		</dict>
-	</array>
+	<array/>
 	<key>OpenEditors</key>
 	<array/>
 	<key>PerspectiveWidths</key>
@@ -233,8 +214,6 @@
 				<string>action</string>
 				<string>NSToolbarFlexibleSpaceItem</string>
 				<string>debugger-enable-breakpoints</string>
-				<string>buildOrClean</string>
-				<string>go</string>
 				<string>build-and-go</string>
 				<string>com.apple.ide.PBXToolbarStopButton</string>
 				<string>get-info</string>
@@ -278,7 +257,7 @@
 						<dict>
 							<key>PBXSmartGroupTreeModuleColumnWidthsKey</key>
 							<array>
-								<real>159</real>
+								<real>189</real>
 							</array>
 							<key>PBXSmartGroupTreeModuleColumnsKey_v4</key>
 							<array>
@@ -290,27 +269,18 @@
 							<key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
 							<array>
 								<string>29B97314FDCFA39411CA2CEA</string>
-								<string>48243B060D33ED0A00C29F8F</string>
-								<string>483A77D80D2EE8C500CB2E4C</string>
-								<string>483A77D90D2EE8D400CB2E4C</string>
-								<string>483A77DD0D2EE8F100CB2E4C</string>
-								<string>483A77E00D2EE90B00CB2E4C</string>
-								<string>29B97317FDCFA39411CA2CEA</string>
-								<string>4890A5EA1205D6ED00452753</string>
-								<string>29B97323FDCFA39411CA2CEA</string>
-								<string>1058C7A0FEA54F0111CA2CBB</string>
-								<string>48348942120595B1004184BC</string>
 								<string>19C28FACFE9D520D11CA2CBB</string>
 								<string>1C37FAAC04509CD000000102</string>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
+									<integer>4</integer>
 									<integer>0</integer>
 								</array>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
-							<string>{{0, 0}, {159, 703}}</string>
+							<string>{{0, 0}, {189, 882}}</string>
 						</dict>
 						<key>PBXTopSmartGroupGIDs</key>
 						<array/>
@@ -320,19 +290,19 @@
 					<key>GeometryConfiguration</key>
 					<dict>
 						<key>Frame</key>
-						<string>{{0, 0}, {176, 721}}</string>
+						<string>{{0, 0}, {206, 900}}</string>
 						<key>GroupTreeTableConfiguration</key>
 						<array>
 							<string>MainColumn</string>
-							<real>159</real>
+							<real>189</real>
 						</array>
 						<key>RubberWindowFrame</key>
-						<string>0 116 1440 762 0 0 1440 878 </string>
+						<string>0 117 1920 941 0 0 1920 1058 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
 					<key>Proportion</key>
-					<string>176pt</string>
+					<string>206pt</string>
 				</dict>
 				<dict>
 					<key>Dock</key>
@@ -343,7 +313,7 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>4890A4C11205A7AE00452753</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>net_defs.h</string>
+								<string>rnotes.html</string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
 									<key>Split0</key>
@@ -351,11 +321,7 @@
 										<key>PBXProjectModuleGUID</key>
 										<string>4890A4C21205A7AE00452753</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>net_defs.h</string>
-										<key>_historyCapacity</key>
-										<integer>0</integer>
-										<key>bookmark</key>
-										<string>488AC38A1211C8DE00A5038A</string>
+										<string>rnotes.html</string>
 										<key>history</key>
 										<array>
 											<string>4890A5541205C1FF00452753</string>
@@ -364,18 +330,18 @@
 											<string>4890A5D41205D58300452753</string>
 											<string>4890A5D51205D58300452753</string>
 											<string>4890A5DC1205D59F00452753</string>
-											<string>4890A5F91205EA8A00452753</string>
-											<string>4890A5FA1205EA8A00452753</string>
-											<string>4890A5FB1205EA8A00452753</string>
 											<string>4890A5FC1205EA8A00452753</string>
 											<string>4890A5FD1205EA8A00452753</string>
-											<string>48821E14120DF1150008EE50</string>
 											<string>48821E15120DF1150008EE50</string>
 											<string>48821E16120DF1150008EE50</string>
 											<string>48134A1C12102F680015BF15</string>
 											<string>48134A1D12102F680015BF15</string>
 											<string>48134A1E12102F680015BF15</string>
-											<string>48134A3312102F7F0015BF15</string>
+											<string>4861FA8F12144B5300BBDEF1</string>
+											<string>4861FA9012144B5300BBDEF1</string>
+											<string>4861FA9112144B5300BBDEF1</string>
+											<string>4861FA9212144B5300BBDEF1</string>
+											<string>4861FA9312144B5300BBDEF1</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -389,18 +355,18 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {1259, 369}}</string>
+								<string>{{0, 0}, {1709, 448}}</string>
 								<key>RubberWindowFrame</key>
-								<string>0 116 1440 762 0 0 1440 878 </string>
+								<string>0 117 1920 941 0 0 1920 1058 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>369pt</string>
+							<string>448pt</string>
 						</dict>
 						<dict>
 							<key>Proportion</key>
-							<string>347pt</string>
+							<string>447pt</string>
 							<key>Tabs</key>
 							<array>
 								<dict>
@@ -414,9 +380,9 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 27}, {1259, 320}}</string>
+										<string>{{10, 27}, {1709, 420}}</string>
 										<key>RubberWindowFrame</key>
-										<string>0 116 1440 762 0 0 1440 878 </string>
+										<string>0 117 1920 941 0 0 1920 1058 </string>
 									</dict>
 									<key>Module</key>
 									<string>XCDetailModule</string>
@@ -465,7 +431,7 @@
 										<key>XCBuildResultsTrigger_Collapse</key>
 										<integer>1021</integer>
 										<key>XCBuildResultsTrigger_Open</key>
-										<integer>1010</integer>
+										<integer>1011</integer>
 									</dict>
 									<key>GeometryConfiguration</key>
 									<dict>
@@ -479,7 +445,7 @@
 						</dict>
 					</array>
 					<key>Proportion</key>
-					<string>1259pt</string>
+					<string>1709pt</string>
 				</dict>
 			</array>
 			<key>Name</key>
@@ -498,11 +464,11 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>488AC3871211C8DE00A5038A</string>
+				<string>4861FAAF12144CE200BBDEF1</string>
 				<string>1CA23ED40692098700951B8B</string>
-				<string>488AC3881211C8DE00A5038A</string>
+				<string>4861FAB012144CE200BBDEF1</string>
 				<string>4890A4C11205A7AE00452753</string>
-				<string>488AC3891211C8DE00A5038A</string>
+				<string>4861FAB112144CE200BBDEF1</string>
 				<string>1CA23EDF0692099D00951B8B</string>
 				<string>1CA23EE00692099D00951B8B</string>
 				<string>1CA23EE10692099D00951B8B</string>
@@ -651,14 +617,14 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>48134A2412102F680015BF15</string>
+				<string>4861FA9912144B5300BBDEF1</string>
 				<string>1CCC7628064C1048000F2A68</string>
 				<string>1CCC7629064C1048000F2A68</string>
-				<string>48134A2512102F680015BF15</string>
-				<string>48134A2612102F680015BF15</string>
-				<string>48134A2712102F680015BF15</string>
-				<string>48134A2812102F680015BF15</string>
-				<string>48134A2912102F680015BF15</string>
+				<string>4861FA9A12144B5300BBDEF1</string>
+				<string>4861FA9B12144B5300BBDEF1</string>
+				<string>4861FA9C12144B5300BBDEF1</string>
+				<string>4861FA9D12144B5300BBDEF1</string>
+				<string>4861FA9E12144B5300BBDEF1</string>
 			</array>
 			<key>ToolbarConfigUserDefaultsMinorVersion</key>
 			<string>2</string>
@@ -675,7 +641,7 @@
 	<key>StatusbarIsVisible</key>
 	<true/>
 	<key>TimeStamp</key>
-	<real>303155422.35388499</real>
+	<real>0.0</real>
 	<key>ToolbarConfigUserDefaultsMinorVersion</key>
 	<string>2</string>
 	<key>ToolbarDisplayMode</key>
@@ -695,7 +661,7 @@
 		<string>/Users/kristian/Documents/Code/XCode/QuakeSpasm/MacOSX/QuakeSpasm.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
-	<string>0 116 1440 762 0 0 1440 878 </string>
+	<string>0 117 1920 941 0 0 1920 1058 </string>
 	<key>WindowToolsV3</key>
 	<array>
 		<dict>
diff --git a/MacOSX/rnotes.html b/MacOSX/rnotes.html
index 824d1510..9a4bcf3d 100644
--- a/MacOSX/rnotes.html
+++ b/MacOSX/rnotes.html
@@ -19,6 +19,8 @@
 					<td valign="top">
 						<ul>
 							<li>Automatic updating via the Sparkle framework</li>
+							<li>Replaced SDL network driver by UDP driver</li>
+							<li>Launcher can be suppressed by passing &quot;-nolauncher&quot; on the command line</li>
 						</ul>
 					</td>
 				</tr>