diff --git a/src/Makefile b/src/Makefile
index c5964ba9..51d73ac0 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,4 @@
-# @(#$Id: Makefile,v 1.18 2005-11-23 10:57:23 dockes Exp $  (C) 2005 J.F.Dockes
+# @(#$Id: Makefile,v 1.19 2005-11-25 08:51:47 dockes Exp $  (C) 2005 J.F.Dockes
 
 # Default values. These can be overridden on the command line ie: 
 # make prefix=/usr
@@ -41,10 +41,12 @@ clean:
 	rm -f qtgui/Makefile qtgui/preview/Makefile qtgui/recoll
 
 distclean: clean
-	rm -f mk/sysconf 
+	rm -f mk/sysconf mk/localdefs sampleconf/recoll.conf recollinstall
 
 install: all
 	./recollinstall ${prefix}
 
 installme:
 	./recollinstall
+
+.PHONY: all static clean distclean install installme
diff --git a/src/internfile/mimehandler.cpp b/src/internfile/mimehandler.cpp
index 0f880ec2..2940da01 100644
--- a/src/internfile/mimehandler.cpp
+++ b/src/internfile/mimehandler.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: mimehandler.cpp,v 1.14 2005-11-24 07:16:15 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: mimehandler.cpp,v 1.15 2005-11-25 08:52:39 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 
 #include <iostream>
@@ -42,7 +42,7 @@ MimeHandler *getMimeHandler(const string &mtype, RclConfig *cfg)
 
     // Break definition into type and name 
     list<string> toks;
-    ConfTree::stringToStrings(hs, toks);
+    stringToStrings(hs, toks);
     if (toks.empty()) {
 	LOGERR(("getMimeHandler: bad mimeconf line for %s\n", mtype.c_str()));
 	return 0;
diff --git a/src/rcldb/rcldb.h b/src/rcldb/rcldb.h
index c1554fce..85f76ae8 100644
--- a/src/rcldb/rcldb.h
+++ b/src/rcldb/rcldb.h
@@ -1,6 +1,6 @@
 #ifndef _DB_H_INCLUDED_
 #define _DB_H_INCLUDED_
-/* @(#$Id: rcldb.h,v 1.17 2005-11-14 09:56:49 dockes Exp $  (C) 2004 J.F.Dockes */
+/* @(#$Id: rcldb.h,v 1.18 2005-11-25 08:53:13 dockes Exp $  (C) 2004 J.F.Dockes */
 
 #include <string>
 #include <list>
@@ -87,12 +87,7 @@ class AdvSearchData {
  * Wrapper class for the native database.
  */
 class Db {
-    AdvSearchData asdata;
-    vector<int> dbindices; // In case there is a postq filter: sequence of 
-                           // db indices that match
-    void *pdata; // Pointer to private data. We don't want db(ie
-                // xapian)-specific defs to show in here
- public:
+public:
     Db();
     ~Db();
     enum OpenMode {DbRO, DbUpd, DbTrunc};
@@ -116,15 +111,29 @@ class Db {
 		  const string& stemlang = "english");
     bool getQueryTerms(list<string>& terms);
 
-    // Get document at rank i. This is probably vastly inferior to the type
-    // of interface in Xapian, but we have to start with something simple
-    // to experiment with the GUI. i is sequential from 0 to some value
+    /** Get document at rank i in current query. 
+
+	This is probably vastly inferior to the type of interface in
+	Xapian, but we have to start with something simple to
+	experiment with the GUI. i is sequential from 0 to some value.
+    */
     bool getDoc(int i, Doc &doc, int *percent = 0);
-    // Get results count
+
+    /** Get document for given filename and ipath */
+    bool getDoc(const string &fn, const string &ipath, Doc &doc);
+
+    /** Get results count for current query */
     int getResCnt();
 
     friend class Rcl::DbPops;
-    private:
+
+private:
+
+    AdvSearchData asdata;
+    vector<int> dbindices; // In case there is a postq filter: sequence of 
+                           // db indices that match
+    void *pdata; // Pointer to private data. We don't want db(ie
+                 // xapian)-specific defs to show in here
     /* Copyconst and assignemt private and forbidden */
     Db(const Db &) {}
     Db & operator=(const Db &) {return *this;};