diff --git a/AUTHORS b/AUTHORS
index 24ad15596..2979e35bb 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,5 @@
 The Transmission Project
-http://transmission.m0k.org/
+http://www.transmissionbt.com/
 
 Lead Developers <transmission-dev@m0k.org>
         Mitchell Livingston <livings124@gmail.com>  (Mac OS X interface, Backend)
diff --git a/macosx/Badger.m b/macosx/Badger.m
index bd56fa1ed..09db7d839 100644
--- a/macosx/Badger.m
+++ b/macosx/Badger.m
@@ -82,11 +82,9 @@
         [[NSApp dockTile] display];
         return;
     }
-    else
-    {
-        if (fQuittingTiger)
-            return;
-    }
+    else if (fQuittingTiger)
+        return;
+    else;
     
     //set completed badge to top right
     BOOL completedChange = fCompleted != fCompletedBadged;
diff --git a/macosx/Controller.m b/macosx/Controller.m
index df990db03..eabb4c3b2 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -131,9 +131,9 @@ typedef enum
 
 #define SUPPORT_FOLDER  @"/Library/Application Support/Transmission/Transfers.plist"
 
-#define WEBSITE_URL @"http://transmission.m0k.org/"
-#define FORUM_URL   @"http://transmission.m0k.org/forum/"
-#define DONATE_URL  @"http://transmission.m0k.org/donate.php"
+#define WEBSITE_URL @"http://www.transmissionbt.com/"
+#define FORUM_URL   @"http://www.transmissionbt.com/forum/"
+#define DONATE_URL  @"http://www.transmissionbt.com/donate.php"
 
 void sleepCallBack(void * controller, io_service_t y, natural_t messageType, void * messageArgument)
 {
@@ -1693,7 +1693,9 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
     BOOL sortByOrder = [sortType isEqualToString: SORT_ORDER];
     
     NSArray * descriptors;
-    if ([sortType isEqualToString: SORT_NAME])
+    if (sortByOrder)
+        descriptors = [[NSArray alloc] initWithObjects: orderDescriptor, nil];
+    else if ([sortType isEqualToString: SORT_NAME])
         descriptors = [[NSArray alloc] initWithObjects: nameDescriptor, orderDescriptor, nil];
     else if ([sortType isEqualToString: SORT_STATE])
     {
@@ -1726,8 +1728,6 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
         
         descriptors = [[NSArray alloc] initWithObjects: trackerDescriptor, nameDescriptor, orderDescriptor, nil];
     }
-    else if (sortByOrder)
-        descriptors = [[NSArray alloc] initWithObjects: orderDescriptor, nil];
     else if ([sortType isEqualToString: SORT_ACTIVITY])
     {
         NSSortDescriptor * rateDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"totalRate" ascending: !asc]
diff --git a/macosx/Credits.rtf b/macosx/Credits.rtf
index 534951819..9bff3d184 100644
--- a/macosx/Credits.rtf
+++ b/macosx/Credits.rtf
@@ -8,7 +8,7 @@
 \fs24 \
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\qc
 
-\b0 \cf0 http://transmission.m0k.org/
+\b0 \cf0 http://www.transmissionbt.com/
 \b \
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
 \cf0 \
diff --git a/macosx/TransmissionHelp/TransmissionHelp.helpindex b/macosx/TransmissionHelp/TransmissionHelp.helpindex
index 269db26b5..e48c226da 100644
Binary files a/macosx/TransmissionHelp/TransmissionHelp.helpindex and b/macosx/TransmissionHelp/TransmissionHelp.helpindex differ
diff --git a/macosx/TransmissionHelp/index.html b/macosx/TransmissionHelp/index.html
index 1343f7fc8..fd45744b1 100644
--- a/macosx/TransmissionHelp/index.html
+++ b/macosx/TransmissionHelp/index.html
@@ -15,7 +15,7 @@
 					<IMG SRC="gfx/TransWindow.png" height="auto" width="225" ALT="Image of Transmission window" BORDER="0">
 					<h1><img class="icon" src="gfx/TransmissionIcon.png" alt="Transmission icon" height="32" width="32" border="0"> Transmission Help</h1>
 					
-					<h4><a href="http://transmission.m0k.org">transmission.m0k.org</a></h4>
+					<h4><a href="http://www.transmissionbt.com/">www.transmissionbt.com</a></h4>
 				</center>
 			</div>
 			<div id="contentcenter"></div>
@@ -33,8 +33,8 @@
 					<p><a href="html/Index2.html">Look up topics easily</a></p>
 					
 					<h2>More Information</h2>
-					<p><a href="http://transmission.m0k.org/forum/">Transmission forums</a></p>
-					<p><a href="http://transmission.m0k.org/trac/timeline">Trac timeline and tickets</a></p>
+					<p><a href="http://www.transmissionbt.com/forum/">Transmission forums</a></p>
+					<p><a href="http://www.transmissionbt.com/trac/timeline">Trac timeline and tickets</a></p>
 	
 			</div>
 		</div>