diff --git a/TODO b/TODO
index ac159650..9869e133 100644
--- a/TODO
+++ b/TODO
@@ -32,5 +32,4 @@ Bug: Using ^s on a bad torrent does not catch the exception.
 
 Show torrent creation date?
 
-RELEASE:
-
+Recheck hash key.
\ No newline at end of file
diff --git a/doc/faq.xml b/doc/faq.xml
index 52e7dd16..289256f5 100644
--- a/doc/faq.xml
+++ b/doc/faq.xml
@@ -22,6 +22,20 @@
       </para></answer>
     </qandaentry>
 
+    <qandaentry>
+      <question><para>
+        I got the message "Could not create download, failed to parse the bencoded data" when adding a torrent, what does it mean?
+      </para></question>
+      <answer><para>
+        The torrent data the library received was not a valid torrent
+        file. If this was a direct http download, try downloading the
+        torrent file and add it manually. This usually happens when
+        the torrent link uses some form of redirection that libcurl
+        does not automatically redirect. If the failure still happens,
+        make sure the file is infact an uncorrupted torrent.
+      </para></answer>
+    </qandaentry>
+
     <qandaentry>
       <question><para>
         How does the session feature work?
@@ -36,6 +50,18 @@
       </para></answer>
     </qandaentry>
 
+    <qandaentry>
+      <question><para>
+        How do i query the tracker for more peers?
+      </para></question>
+      <answer><para>
+        Go into the download view screen and press 't' to initiate a
+        new tracker request. If the tracker requires a minimum timeout
+        between requests you can override this by using the capital
+        'T'. Don't abuse this feature.
+      </para></answer>
+    </qandaentry>
+
   </qandaset>
 
 </article>
diff --git a/src/core/manager.cc b/src/core/manager.cc
index e46d440e..66e9fabd 100644
--- a/src/core/manager.cc
+++ b/src/core/manager.cc
@@ -183,7 +183,7 @@ Manager::create_final(std::istream* s) {
   (*itr)->get_download().set_ip(m_dns);
 
   if (!m_defaultRoot.empty())
-    (*itr)->get_download().set_root_dir(m_defaultRoot + ((*itr)->get_download().get_entry_size() ? (*itr)->get_download().get_name() : ""));
+    (*itr)->get_download().set_root_dir(m_defaultRoot + ((*itr)->get_download().get_entry_size() > 1 ? (*itr)->get_download().get_name() : ""));
 
   start(*itr);
   m_downloadStore.save(*itr);