diff --git a/macosx/Defaults.plist b/macosx/Defaults.plist
index 78f49262c..49a7631f0 100644
--- a/macosx/Defaults.plist
+++ b/macosx/Defaults.plist
@@ -55,7 +55,7 @@
 	<key>MoveFolder</key>
 	<string>~/Desktop</string>
 	<key>NatTraversal</key>
-	<true/>
+	<false/>
 	<key>PlayDownloadSound</key>
 	<true/>
 	<key>PlaySeedingSound</key>
diff --git a/macosx/PiecesView.h b/macosx/PiecesView.h
index 160e756d3..c20ce84bd 100644
--- a/macosx/PiecesView.h
+++ b/macosx/PiecesView.h
@@ -1,10 +1,26 @@
-//
-//  PiecesWindowController.h
-//  Transmission
-//
-//  Created by Livingston on 9/23/06.
-//  Copyright 2006 __MyCompanyName__. All rights reserved.
-//
+/******************************************************************************
+ * $Id$
+ *
+ * Copyright (c) 2005-2006 Transmission authors and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *****************************************************************************/
 
 #import <Cocoa/Cocoa.h>
 #import "Torrent.h"
diff --git a/macosx/PiecesView.m b/macosx/PiecesView.m
index 23d58be5c..45068d06f 100644
--- a/macosx/PiecesView.m
+++ b/macosx/PiecesView.m
@@ -1,10 +1,26 @@
-//
-//  PiecesWindowController.m
-//  Transmission
-//
-//  Created by Livingston on 9/23/06.
-//  Copyright 2006 __MyCompanyName__. All rights reserved.
-//
+/******************************************************************************
+ * $Id$
+ *
+ * Copyright (c) 2005-2006 Transmission authors and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *****************************************************************************/
 
 #import "PiecesView.h"
 
diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m
index 9e7cd6291..f31b7a5e6 100644
--- a/macosx/PrefsController.m
+++ b/macosx/PrefsController.m
@@ -427,12 +427,12 @@
     
     if (status == 2)
     {
-        [fNatStatusField setStringValue: @"Ports successfully mapped"];
+        [fNatStatusField setStringValue: @"Port successfully mapped"];
         [fNatStatusImage setImage: [NSImage imageNamed: @"Check.png"]];
     }
     else if (status == 3 || status == 4)
     {
-        [fNatStatusField setStringValue: @"Error mapping ports"];
+        [fNatStatusField setStringValue: @"Error mapping port"];
         [fNatStatusImage setImage: [NSImage imageNamed: @"Error.tiff"]];
     }
     else