diff --git a/doc/rtorrent.1.xml b/doc/rtorrent.1.xml
index 46877c3c..186d7b21 100644
--- a/doc/rtorrent.1.xml
+++ b/doc/rtorrent.1.xml
@@ -34,11 +34,16 @@
     <title>DESCRIPTION</title>
 
     <para>
-      <command>rtorrent</command> is a BitTorrent client for ncurses,
-      using the <emphasis>libtorrent</emphasis> library. The client
-      and library is written in C++ with emphasis on speed and
-      efficiency, while delivering equivalent features to those found
-      in GUI based clients in an ncurses client.
+<command>rtorrent</command> is a BitTorrent client for ncurses, using
+the <emphasis>libtorrent</emphasis> library. The client and library is
+written in C++ with emphasis on speed and efficiency, while delivering
+equivalent features to those found in GUI based clients in an ncurses
+client.
+    </para>
+
+    <para>
+Most of the options below have their own default unit in addition to
+supporting B, K, M and G suffixes.
     </para>
 
   </refsect1>
@@ -636,7 +641,7 @@ have been deleted. Clear the association with the 'U' key.
 
 Close any active torrents on filesystems with less than
 <emphasis>space</emphasis> diskspace left. Use with
-<emphasis>schedule</emphasis>.
+the <emphasis>schedule</emphasis> option.
 
         </para></listitem>
       </varlistentry>
@@ -651,11 +656,11 @@ Stop torrents when they reach the given upload ratio
 <emphasis>min_ratio</emphasis> in percent. If the optional
 <emphasis>min_upload</emphasis> is given, require a total
 upload amount of this many bytes as well. If the optional
-<emphasis>max_ratio></emphasis> is given, stop the torrent
+<emphasis>max_ratio</emphasis> is given, stop the torrent
 when reaching this ratio regardless of the total upload
 amount. Exclude certain torrent by pressing 
 <emphasis>Shift+I</emphasis> in the downlist list.
-Use with <emphasis>schedule</emphasis>.
+Use with the <emphasis>schedule</emphasis> option.
 
         </para></listitem>
       </varlistentry>
@@ -848,6 +853,17 @@ gives the client 128 sockets to use as it wishes.
         </para></listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term>max_memory_usage = <replaceable>bytes</replaceable></term>
+        <listitem><para>
+
+Set the max amount of memory space used to mapping file chunks. This
+may also be set using <emphasis>ulimit -m</emphasis> where 3/4 will be
+allocated to file chunks.
+
+        </para></listitem>
+      </varlistentry>
+
       <varlistentry>
         <term>send_buffer_size = <replaceable>value</replaceable></term>
         <term>receive_buffer_size = <replaceable>value</replaceable></term>
diff --git a/src/ui/download_list.cc b/src/ui/download_list.cc
index 2e475af0..6fa88fde 100644
--- a/src/ui/download_list.cc
+++ b/src/ui/download_list.cc
@@ -319,7 +319,7 @@ DownloadList::setup_keys() {
   m_bindings['\n']          = sigc::bind(sigc::mem_fun(*this, &DownloadList::receive_view_input), INPUT_LOAD_MODIFIED);
   m_bindings[KEY_ENTER]     = sigc::bind(sigc::mem_fun(*this, &DownloadList::receive_view_input), INPUT_LOAD_MODIFIED);
   m_bindings['\x0F']        = sigc::bind(sigc::mem_fun(*this, &DownloadList::receive_view_input), INPUT_CHANGE_DIRECTORY);
-  m_bindings['\x10']        = sigc::bind(sigc::mem_fun(*this, &DownloadList::receive_view_input), INPUT_COMMAND);
+  m_bindings['X' - '@']     = sigc::bind(sigc::mem_fun(*this, &DownloadList::receive_view_input), INPUT_COMMAND);
 
   m_uiArray[DISPLAY_LOG]->bindings()[' ']                 = sigc::bind(sigc::mem_fun(*this, &DownloadList::activate_display), DISPLAY_DOWNLOAD_LIST);
   m_uiArray[DISPLAY_LOG]->bindings()[KEY_LEFT]            = sigc::bind(sigc::mem_fun(*this, &DownloadList::activate_display), DISPLAY_DOWNLOAD_LIST);