diff --git a/macosx/Controller.m b/macosx/Controller.m
index da30617d0..f5a995081 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -123,6 +123,7 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
     [fWindow setDelegate: self];
     
     [fWindow makeFirstResponder: fTableView];
+    [fWindow setExcludedFromWindowsMenu: YES];
     
     //set table size
     if ([fDefaults boolForKey: @"SmallView"])
@@ -1223,11 +1224,9 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
         return;
     
     NSCalendarDate * currentDate = [NSCalendarDate calendarDate];
-    //do nothing if not within first few seconds of hour
-    if ([currentDate minuteOfHour] > 0 || [currentDate secondOfMinute] >= AUTO_SPEED_LIMIT_SECONDS)
-        return;
-    
-    if ([currentDate hourOfDay] == (fSpeedLimitEnabled ? offHour : onHour))
+    //toggle if within first few seconds of hour
+    if ([currentDate minuteOfHour] == 0 && [currentDate secondOfMinute] < AUTO_SPEED_LIMIT_SECONDS
+            && [currentDate hourOfDay] == (fSpeedLimitEnabled ? offHour : onHour))
     {
         [self toggleSpeedLimit: nil];
         
diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib
index 86c2853db..1442fe8e8 100644
--- a/macosx/English.lproj/MainMenu.nib/info.nib
+++ b/macosx/English.lproj/MainMenu.nib/info.nib
@@ -13,7 +13,7 @@
 		<key>1603</key>
 		<string>337 545 477 67 0 0 1152 842 </string>
 		<key>29</key>
-		<string>227 675 451 44 0 0 1152 842 </string>
+		<string>104 684 520 44 0 0 1152 842 </string>
 		<key>456</key>
 		<string>396 374 216 206 0 0 1152 842 </string>
 		<key>581</key>
@@ -31,8 +31,8 @@
 	<integer>3</integer>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>29</integer>
 		<integer>21</integer>
+		<integer>29</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>8J135</string>
diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
index 41fc85e5d..39bca2381 100644
Binary files a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib and b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib differ
diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m
index 64232e32b..f374b874f 100644
--- a/macosx/InfoWindowController.m
+++ b/macosx/InfoWindowController.m
@@ -182,7 +182,7 @@
         [fDataLocationField setToolTip: [torrent dataLocation]];
         [fDateStartedField setObjectValue: [torrent date]];
         
-        //don't allow empty strings to be selected
+        //allow these strings to be selected
         [fTrackerField setSelectable: YES];
         [fAnnounceField setSelectable: YES];
         [fHashField setSelectable: YES];
diff --git a/macosx/PrefsWindow.m b/macosx/PrefsWindow.m
index e25968898..37a935292 100644
--- a/macosx/PrefsWindow.m
+++ b/macosx/PrefsWindow.m
@@ -35,7 +35,7 @@
 
 - (void) close
 {
-    [self makeFirstResponder: nil]; //essentially saves changes on window close
+    [self makeFirstResponder: nil]; //essentially saves pref changes on window close
     [super close];
 }