diff --git a/NEWS b/NEWS
index a7dc46593..dcfabcd7c 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ NEWS file for Transmission <http://transmission.m0k.org/>
 1.00 (zzzz/xx/yy)
 - All Platforms:
    + UPnP now performed by MiniUPnP
+   + Option to prefer not using encryption
 - OS X:
    + Leopard: Time Machine will ignore incomplete downloads
    + Pieces Bar (return of Advanced Bar)
diff --git a/macosx/Controller.m b/macosx/Controller.m
index 5cb883385..8aabd6173 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -526,7 +526,6 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
         NSString * path;
         while ((path = [torrentEnumerator nextObject]))
             [[NSFileManager defaultManager] removeFileAtPath: path handler: nil];
-        [fTempTorrentFiles removeAllObjects];
     }
     
     //remember window states and close all windows
@@ -1409,7 +1408,6 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
 
 - (void) updateUI
 {
-    #warning make main thread?
     [fTorrents makeObjectsPerformSelector: @selector(update)];
     
     if (![NSApp isHidden])
diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib
index d4ab2a89e..3853a6ae2 100644
--- a/macosx/English.lproj/MainMenu.nib/info.nib
+++ b/macosx/English.lproj/MainMenu.nib/info.nib
@@ -10,8 +10,7 @@
 	<integer>5</integer>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>1639</integer>
-		<integer>1895</integer>
+		<integer>1603</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>9A581</string>
diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
index b8c4dc4ca..8eff56c46 100644
Binary files a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib and b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib differ