diff --git a/macosx/English.lproj/PrefsWindow.xib b/macosx/English.lproj/PrefsWindow.xib
index 8fae018cc..e2f8e3eb5 100644
--- a/macosx/English.lproj/PrefsWindow.xib
+++ b/macosx/English.lproj/PrefsWindow.xib
@@ -8,6 +8,8 @@
 		<string key="IBDocument.HIToolboxVersion">352.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
+			<integer value="1481"/>
+			<integer value="1361"/>
 			<integer value="66"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
@@ -2116,7 +2118,7 @@ AAABAAAAAQ</bytes>
 				<string key="NSExtension">NSResponder</string>
 			</object>
 			<object class="NSCustomView" id="538122014">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">256</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2529,6 +2531,7 @@ AAABAAAAAQ</bytes>
 					</object>
 				</object>
 				<string key="NSFrameSize">{535, 258}</string>
+				<reference key="NSSuperview"/>
 				<string key="NSClassName">NSView</string>
 				<string key="NSExtension">NSResponder</string>
 			</object>
@@ -2680,13 +2683,13 @@ AAABAAAAAQ</bytes>
 					<object class="NSButton" id="622323577">
 						<reference key="NSNextResponder" ref="204700639"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{133, 174}, {252, 18}}</string>
+						<string key="NSFrame">{{133, 174}, {248, 18}}</string>
 						<reference key="NSSuperview" ref="204700639"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="20752657">
 							<int key="NSCellFlags">67239424</int>
 							<int key="NSCellFlags2">0</int>
-							<string key="NSContents">Connect to tracker with HTTP proxy:</string>
+							<string key="NSContents">Connect to tracker with HTTP proxy</string>
 							<reference key="NSSupport" ref="86725571"/>
 							<reference key="NSControlView" ref="622323577"/>
 							<int key="NSButtonFlags">1211912703</int>
@@ -2961,14 +2964,14 @@ AAABAAAAAQ</bytes>
 				<string key="NSExtension">NSResponder</string>
 			</object>
 			<object class="NSCustomView" id="810116101">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">256</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<object class="NSTextField" id="712370553">
 						<reference key="NSNextResponder" ref="810116101"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{99, 205}, {96, 17}}</string>
+						<string key="NSFrame">{{99, 221}, {96, 17}}</string>
 						<reference key="NSSuperview" ref="810116101"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="957501329">
@@ -2984,7 +2987,7 @@ AAABAAAAAQ</bytes>
 					<object class="NSTextField" id="966253460">
 						<reference key="NSNextResponder" ref="810116101"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{122, 247}, {68, 17}}</string>
+						<string key="NSFrame">{{122, 263}, {68, 17}}</string>
 						<reference key="NSSuperview" ref="810116101"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="404750455">
@@ -3000,7 +3003,7 @@ AAABAAAAAQ</bytes>
 					<object class="NSTextField" id="1807399">
 						<reference key="NSNextResponder" ref="810116101"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{119, 275}, {71, 17}}</string>
+						<string key="NSFrame">{{119, 291}, {71, 17}}</string>
 						<reference key="NSSuperview" ref="810116101"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="705209842">
@@ -3016,7 +3019,7 @@ AAABAAAAAQ</bytes>
 					<object class="NSTextField" id="485614707">
 						<reference key="NSNextResponder" ref="810116101"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{201, 203}, {50, 22}}</string>
+						<string key="NSFrame">{{201, 219}, {50, 22}}</string>
 						<reference key="NSSuperview" ref="810116101"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="754049708">
@@ -3082,7 +3085,7 @@ AAABAAAAAQ</bytes>
 					<object class="NSButton" id="898169443">
 						<reference key="NSNextResponder" ref="810116101"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{81, 351}, {158, 18}}</string>
+						<string key="NSFrame">{{81, 367}, {158, 18}}</string>
 						<reference key="NSSuperview" ref="810116101"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="844429646">
@@ -3104,7 +3107,7 @@ AAABAAAAAQ</bytes>
 					<object class="NSButton" id="151618662">
 						<reference key="NSNextResponder" ref="810116101"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{100, 299}, {165, 18}}</string>
+						<string key="NSFrame">{{100, 315}, {165, 18}}</string>
 						<reference key="NSSuperview" ref="810116101"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="658673085">
@@ -3126,7 +3129,7 @@ AAABAAAAAQ</bytes>
 					<object class="NSTextField" id="535988411">
 						<reference key="NSNextResponder" ref="810116101"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{99, 335}, {342, 14}}</string>
+						<string key="NSFrame">{{99, 351}, {342, 14}}</string>
 						<reference key="NSSuperview" ref="810116101"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="644224844">
@@ -3142,7 +3145,7 @@ AAABAAAAAQ</bytes>
 					<object class="NSSecureTextField" id="894846458">
 						<reference key="NSNextResponder" ref="810116101"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{195, 245}, {179, 22}}</string>
+						<string key="NSFrame">{{195, 261}, {179, 22}}</string>
 						<reference key="NSSuperview" ref="810116101"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSSecureTextFieldCell" key="NSCell" id="38151087">
@@ -3163,7 +3166,7 @@ AAABAAAAAQ</bytes>
 					<object class="NSTextField" id="764256678">
 						<reference key="NSNextResponder" ref="810116101"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{99, 166}, {123, 17}}</string>
+						<string key="NSFrame">{{99, 182}, {123, 17}}</string>
 						<reference key="NSSuperview" ref="810116101"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="1067941383">
@@ -3369,7 +3372,7 @@ AAABAAAAAQ</bytes>
 							</object>
 							<reference ref="1018053122"/>
 						</object>
-						<string key="NSFrame">{{102, 47}, {349, 113}}</string>
+						<string key="NSFrame">{{102, 63}, {349, 113}}</string>
 						<reference key="NSSuperview" ref="810116101"/>
 						<reference key="NSNextKeyView" ref="206862330"/>
 						<int key="NSsFlags">18</int>
@@ -3383,7 +3386,7 @@ AAABAAAAAQ</bytes>
 					<object class="NSSegmentedControl" id="432022023">
 						<reference key="NSNextResponder" ref="810116101"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{102, 19}, {67, 23}}</string>
+						<string key="NSFrame">{{102, 35}, {67, 23}}</string>
 						<reference key="NSSuperview" ref="810116101"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSSegmentedCell" key="NSCell" id="1040339170">
@@ -3421,7 +3424,7 @@ AAABAAAAAQ</bytes>
 					<object class="NSTextField" id="189299072">
 						<reference key="NSNextResponder" ref="810116101"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{174, 23}, {275, 14}}</string>
+						<string key="NSFrame">{{174, 39}, {275, 14}}</string>
 						<reference key="NSSuperview" ref="810116101"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="159713069">
@@ -3437,7 +3440,7 @@ AAABAAAAAQ</bytes>
 					<object class="NSTextField" id="717982135">
 						<reference key="NSNextResponder" ref="810116101"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{195, 273}, {179, 22}}</string>
+						<string key="NSFrame">{{195, 289}, {179, 22}}</string>
 						<reference key="NSSuperview" ref="810116101"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="80231199">
@@ -3451,8 +3454,29 @@ AAABAAAAAQ</bytes>
 							<reference key="NSTextColor" ref="430340990"/>
 						</object>
 					</object>
+					<object class="NSButton" id="749999527">
+						<reference key="NSNextResponder" ref="810116101"/>
+						<int key="NSvFlags">256</int>
+						<string key="NSFrame">{{493, 12}, {25, 25}}</string>
+						<reference key="NSSuperview" ref="810116101"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSButtonCell" key="NSCell" id="803023037">
+							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags2">134217728</int>
+							<string key="NSContents"/>
+							<reference key="NSSupport" ref="86725571"/>
+							<reference key="NSControlView" ref="749999527"/>
+							<int key="NSButtonFlags">-2038415105</int>
+							<int key="NSButtonFlags2">161</int>
+							<string key="NSAlternateContents"/>
+							<string key="NSKeyEquivalent"/>
+							<int key="NSPeriodicDelay">200</int>
+							<int key="NSPeriodicInterval">25</int>
+						</object>
+					</object>
 				</object>
-				<string key="NSFrameSize">{535, 387}</string>
+				<string key="NSFrameSize">{535, 403}</string>
+				<reference key="NSSuperview"/>
 				<string key="NSClassName">NSView</string>
 				<string key="NSExtension">NSResponder</string>
 			</object>
@@ -5810,6 +5834,14 @@ AAABAAAAAQ</bytes>
 					</object>
 					<int key="connectionID">1659</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">helpForRemote:</string>
+						<reference key="source" ref="511492310"/>
+						<reference key="destination" ref="749999527"/>
+					</object>
+					<int key="connectionID">1662</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -7491,6 +7523,7 @@ AAABAAAAAQ</bytes>
 							<reference ref="485614707"/>
 							<reference ref="898169443"/>
 							<reference ref="535988411"/>
+							<reference ref="749999527"/>
 						</object>
 						<reference key="parent" ref="37013934"/>
 						<string key="objectName">Remote</string>
@@ -8027,6 +8060,20 @@ AAABAAAAAQ</bytes>
 						<reference key="object" ref="677732006"/>
 						<reference key="parent" ref="995948995"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1660</int>
+						<reference key="object" ref="749999527"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="803023037"/>
+						</object>
+						<reference key="parent" ref="810116101"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1661</int>
+						<reference key="object" ref="803023037"/>
+						<reference key="parent" ref="749999527"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -8197,6 +8244,8 @@ AAABAAAAAQ</bytes>
 					<string>1644.ImportedFromIB2</string>
 					<string>1657.IBPluginDependency</string>
 					<string>1657.ImportedFromIB2</string>
+					<string>1660.IBPluginDependency</string>
+					<string>1661.IBPluginDependency</string>
 					<string>190.IBPluginDependency</string>
 					<string>190.ImportedFromIB2</string>
 					<string>192.IBPluginDependency</string>
@@ -8479,7 +8528,7 @@ AAABAAAAAQ</bytes>
 					<reference ref="761722050"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="761722050"/>
-					<string>{{455, 152}, {535, 387}}</string>
+					<string>{{414, 530}, {535, 403}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="761722050"/>
 					<string>{{281, 577}, {539, 315}}</string>
@@ -8561,6 +8610,8 @@ AAABAAAAAQ</bytes>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="761722050"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="761722050"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="761722050"/>
@@ -8731,7 +8782,7 @@ AAABAAAAAQ</bytes>
 					<reference ref="761722050"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="761722050"/>
-					<string>{{327, 403}, {535, 293}}</string>
+					<string>{{271, 370}, {535, 293}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="761722050"/>
 					<string>{{281, 577}, {539, 315}}</string>
@@ -8785,7 +8836,7 @@ AAABAAAAAQ</bytes>
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">1659</int>
+			<int key="maxID">1662</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -8877,6 +8928,7 @@ AAABAAAAAQ</bytes>
 							<string>folderSheetShow:</string>
 							<string>helpForNetwork:</string>
 							<string>helpForPeers:</string>
+							<string>helpForRemote:</string>
 							<string>importFolderSheetShow:</string>
 							<string>incompleteFolderSheetShow:</string>
 							<string>resetWarnings:</string>
@@ -8956,6 +9008,7 @@ AAABAAAAAQ</bytes>
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
+							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">
diff --git a/macosx/PrefsController.h b/macosx/PrefsController.h
index da31fda27..1185022dc 100644
--- a/macosx/PrefsController.h
+++ b/macosx/PrefsController.h
@@ -135,6 +135,7 @@
 
 - (void) helpForPeers: (id) sender;
 - (void) helpForNetwork: (id) sender;
+- (void) helpForRemote: (id) sender;
 
 - (void) rpcUpdatePrefs;
 
diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m
index 75980a8ea..e2e91006c 100644
--- a/macosx/PrefsController.m
+++ b/macosx/PrefsController.m
@@ -859,6 +859,12 @@
         inBook: [[NSBundle mainBundle] objectForInfoDictionaryKey: @"CFBundleHelpBookName"]];
 }
 
+- (void) helpForRemote: (id) sender
+{
+    [[NSHelpManager sharedHelpManager] openHelpAnchor: @"RemotePrefs"
+        inBook: [[NSBundle mainBundle] objectForInfoDictionaryKey: @"CFBundleHelpBookName"]];
+}
+
 - (void) rpcUpdatePrefs
 {
     //encryption
diff --git a/macosx/TorrentTableView.h b/macosx/TorrentTableView.h
index a709067d0..bb187e543 100644
--- a/macosx/TorrentTableView.h
+++ b/macosx/TorrentTableView.h
@@ -55,7 +55,7 @@
 - (BOOL) isGroupCollapsed: (int) value;
 - (void) removeCollapsedGroup: (int) value;
 - (void) removeAllCollapsedGroups;
-- (void) saveCollapsedGroups;
+- (void) refreshCollapsedGroups;
 
 - (void) removeButtonTrackingAreas;
 - (void) setControlButtonHover: (int) row;
diff --git a/macosx/TorrentTableView.m b/macosx/TorrentTableView.m
index 83ca5b0e8..acad3c076 100644
--- a/macosx/TorrentTableView.m
+++ b/macosx/TorrentTableView.m
@@ -122,7 +122,7 @@
 
 - (BOOL) isGroupCollapsed: (int) value
 {
-    if (value < 0)
+    if (value == -1)
         value = MAX_GROUP;
     
     return [fCollapsedGroups containsIndex: value];
@@ -130,7 +130,7 @@
 
 - (void) removeCollapsedGroup: (int) value
 {
-    if (value < 0)
+    if (value == -1)
         value = MAX_GROUP;
     
     [fCollapsedGroups removeIndex: value];
diff --git a/macosx/TransmissionHelp/TransmissionHelp.helpindex b/macosx/TransmissionHelp/TransmissionHelp.helpindex
index bc629634d..d1e104530 100644
Binary files a/macosx/TransmissionHelp/TransmissionHelp.helpindex and b/macosx/TransmissionHelp/TransmissionHelp.helpindex differ
diff --git a/macosx/TransmissionHelp/html/FAQ.html b/macosx/TransmissionHelp/html/FAQ.html
index 2538062dc..88d81a557 100644
--- a/macosx/TransmissionHelp/html/FAQ.html
+++ b/macosx/TransmissionHelp/html/FAQ.html
@@ -21,7 +21,7 @@
 			</div>
 				<p>Read these tips for <a href="Speed.html">maximizing your download speed</a>.
 				<p>Some Internet Service Providers (ISPs) throttle peer-to-peer traffic, and even block it completely on well known peer to peer ports. If your ISP is listed on <a href="http://www.azureuswiki.com/index.php/Bad_ISPs">this page</a>, it is likely you will experience these issues. 
-				<p> Transmission's encryption feature may overcome any ISP throttling. Checking the 'Ignore unencrypted peers' box (Prefs >> Peers) also may improve your speed further, at the expense of losing some potential peers in the swarm. Changing the port Transmission uses might help if the ISP targets particular ports.
+				<p> Transmission's encryption feature may overcome any ISP throttling. Checking the 'Ignore unencrypted peers' box (Prefs >> Advanced) also may improve your speed further, at the expense of losing some potential peers in the swarm. Changing the port Transmission uses might help if the ISP targets particular ports.
 				
 				<p>Ultimately, the speed you get depends on the quality of the peers you are downloading from. If they have dial up connections, you are only going to be able to download at dial up speeds. 
 				Furthermore, if there are few seeds and many peers, more people will be fighting for the same scarce pieces which will slow things down. 
@@ -72,6 +72,10 @@
 				<i>Have</i> is the sum of verified and unverified data. <br>
 				<i>Failed DL</i> is data that failed our checksum test and needs to be downloaded again.
 				<p>
+			<div id="pagetitle">
+				<h1>What does the 'Tracker' tab mean in the Inspector? </h1>
+			</div>
+				<p>See <a href="tracker.html">this page.</a>
 			<div id="pagetitle">
 				<h1>What are 'nightlies'?</h1>
 			</div>
diff --git a/macosx/TransmissionHelp/html/Index2.html b/macosx/TransmissionHelp/html/Index2.html
index ce181aac5..53208c3a8 100644
--- a/macosx/TransmissionHelp/html/Index2.html
+++ b/macosx/TransmissionHelp/html/Index2.html
@@ -142,6 +142,18 @@
 				</td>
 			</tr>
 
+			<tr>
+				<td class="blue" valign="top" width="135">
+					<p><a href="remote.html">Remote</a></p>
+				</td>
+
+				<td class="blue" valign="top" width="18"></td>
+
+				<td class="blue" valign="top" width="250">
+					<p class="seealso">&nbsp;</p>
+				</td>
+			</tr>
+			
 			<tr>
 				<td class="blue" valign="top" width="135">
 					<p><a href="pfrouter.html">Router</a></p>
diff --git a/macosx/TransmissionHelp/html/gettingstarted.html b/macosx/TransmissionHelp/html/gettingstarted.html
index e9c84fb8f..04fc46d6e 100644
--- a/macosx/TransmissionHelp/html/gettingstarted.html
+++ b/macosx/TransmissionHelp/html/gettingstarted.html
@@ -110,7 +110,8 @@
 						<td valign="top">
 							<p>Transmission allows you to sort your torrents by various criteria. Choose "Sort Transfers By" in the View menu, as well as the Action menu.
 							<p>You can also filter your torrents by their activity state. Simply enable the Filter bar in the View menu.
-							<p>Transmission allows you to group torrents by color labels. Just right click a transfer (or a group) and select a group from the contextual menu. These groups can then be used as sorting and filtering criteria. You can even rename the group colors by going to the Transfer Menu >> Group >> Show Groups >> double click a name.
+							<p>Transmission allows you to group torrents by colour labels. Groups can be assigned upon adding a transfer to the list, and you can drag transfers into different groups to change their colour. You can also right click a transfer (or a selection of transfers) and choose a group from the contextual menu.
+							<p>These groups can then be used as sorting and filtering criteria. You can even rename the group colours by going to the Transfer Menu >> Group >> Show Groups >> double click a name.
 							
 						</td>
 					</tr>
diff --git a/macosx/TransmissionHelp/html/network.html b/macosx/TransmissionHelp/html/network.html
index f1d689876..e16a41682 100644
--- a/macosx/TransmissionHelp/html/network.html
+++ b/macosx/TransmissionHelp/html/network.html
@@ -1,7 +1,5 @@
 <html>
 
-	<a name="NetworkPrefs"></a>
-	
 	<head>
 		<META http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<link media="all" rel="stylesheet" href="../styles/TransBody.css" />
@@ -24,6 +22,12 @@
 				<p>You haven't port forwarded correctly. Port forwarding opens a port in your firewall or router so that incoming connections from the outside world can be made with Transmission. If the port is forwarded, other people in the torrent can see you, thus increasing your potential number of connections, which more importantly, may increase the speed of your download.
 				<p>You need to port forward if you share your internet connection with a router, or if your broadband modem is a router itself. In most cases Transmission can do this automatically, see <a href="portforward.html">this page</a> for instructions on port forwarding.
 
+				<div id="pagetitle">
+					<h1>What is a 'Tracker Proxy'? </h1>
+				</div>
+				<p>Using a proxy for connections to the tracker means that instead of connecting directly to the tracker, you connect to some other <i>proxy server</i>, which in turn connects to the tracker itself. Thus the tracker will see the proxy IP address as the source address rather than your own.
+				<p>Using a proxy may increase your privacy somewhat, making it harder for third parties to monitor your activity. However, using a proxy slows down tracker communication as notifications are no longer sent directly.
+				<p>If you want to use a proxy, enter its address and authenticate as necessary.
 				<p>
 
 		</div>
diff --git a/macosx/TransmissionHelp/html/remote.html b/macosx/TransmissionHelp/html/remote.html
new file mode 100644
index 000000000..89fc473cb
--- /dev/null
+++ b/macosx/TransmissionHelp/html/remote.html
@@ -0,0 +1,33 @@
+<html>
+	
+	<a name="RemotePrefs"></a>
+	
+	<head>
+		<META http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<link media="all" rel="stylesheet" href="../styles/TransBody.css" />
+		<title>Remote Help</title>
+	</head>
+	<body>
+		<div id="mainbox">
+		<A NAME="TransFAQ"></A>
+		<div id="banner">
+				<a name="menus"></a>
+				<div id="machelp"><a class="bread" href="../index.html">Transmission Help</a>
+				</div>
+				<div id="index">
+				<a class="leftborder" href="../html/Index2.html">Index</a></div>
+				</div>
+			</div>
+
+			<div id="pagetitle">
+				<h1>What does allowing Transmission to be operated remotely mean? </h1>
+			</div>
+				<p>Using an application such as <i><a href="http://www.clutchbt.com">Clutch</a></i> or <i>transmission-remote</i>, you can monitor and manage your transfers from any location on the internet. Leave this option unchecked if you are only going to be managing your transfers on your local machine.
+				<p>See your remote manager's documentation for operating instructions. 
+				<p>For security purposes, you can password protect access to Transmission, as well as restrict access to a trusted list of external IP addresses. To add an address to the list, click the + button.
+				<p>
+
+		</div>
+	</body>
+	
+</html>
\ No newline at end of file
diff --git a/macosx/TransmissionHelp/html/tracker.html b/macosx/TransmissionHelp/html/tracker.html
index ce411ea7c..b6a668c6e 100644
--- a/macosx/TransmissionHelp/html/tracker.html
+++ b/macosx/TransmissionHelp/html/tracker.html
@@ -16,21 +16,25 @@
 				<a class="leftborder" href="../html/Index2.html">Index</a></div>
 				</div>
 			</div>
+			<div id="pagetitle">
+				<h1>Can I add/remove/edit the trackers in my transfers? </h1>
+			</div>
+				<p>Yes. To add trackers to a currently running transfer, go to Inspector > Tracker, and click the plus button (+). To remove them click minus button (-). Multiple trackers can also be added to torrent files you create.
+				<p>
 			<div id="pagetitle">
 				<h1>What is 'Tier 1', 'Tier 2' etc? </h1>
 			</div>
-				<p>Transmission supports multitracker torrents. These are torrents which have multiple trackers as a fallback in case one doesn't respond. All of a given torrent's trackers are divided into 'Tiers'. Transmission randomly chooses a tracker from Tier 1 until it finds one that works. If it doesn't it moves on to Tier 2, and so on. This system prevents any one tracker from being overloaded.
-				<p>It is not possible to edit the tracker entries.
+				<p>Transmission supports multitracker torrents. These are torrents which have multiple trackers as a fallback in case one doesn't respond. All of a given torrent's trackers are divided into 'Tiers'. Transmission randomly chooses a tracker from Tier 1 until it finds one that works. If it doesn't it moves on to Tier 2, and so on. This system prevents any one tracker being overloaded.
 				<p>
 			<div id="pagetitle">
 				<h1>What does 'announce' mean? </h1>
 			</div>
-				<p>When Transmission <i>announces</i>, it is updating its presence to the tracker and asking for more peers. This happens periodically, at the discretion of the tracker, however can be manually invoked via Transfers menu >> Update tracker.
+				<p>When Transmission <i>announces</i>, it is updating its presence to the tracker, and asking for more peers. This happens periodically, at the discretion of the tracker, however can be manually invoked via Transfers menu >> Update tracker.
 				<p>
 			<div id="pagetitle">
 				<h1>What does 'scrape' mean? </h1>
 			</div>
-				<p><i>Scraping</i> the tracker simply means asking for information about the swarm itself. Information typically received involves the total number of seeders, total number of leechers, and total number of complete downloads of the data.
+				<p><i>Scraping</i> the tracker simply means asking for information about the swarm itself. For example, the number of peers, seeds etc.
 				<p>