diff --git a/src/bin/apprec.py b/src/bin/apprec.py
index 2e545b3..0d0812e 100755
--- a/src/bin/apprec.py
+++ b/src/bin/apprec.py
@@ -35,9 +35,9 @@ if __name__ == '__main__':
     cfg = Config()
     rec = Recommender(cfg)
     logging.info("Computation started at %s" % begin_time)
-    user = RandomPopcon(cfg.popcon_dir,os.path.join(cfg.filters,"desktop"))
-    #user = LocalSystem()
-    user.filter_pkg_profile(os.path.join(cfg.filters,"desktop"))
+    #user = RandomPopcon(cfg.popcon_dir,os.path.join(cfg.filters_dir,"desktopapps"))
+    user = LocalSystem()
+    user.filter_pkg_profile(os.path.join(cfg.filters_dir,"desktopapps"))
     user.maximal_pkg_profile()
 
     logging.info("Recommending applications for user %s" % user.user_id)
diff --git a/src/bin/cross_validation.py b/src/bin/cross_validation.py
index c9335cc..0eca204 100755
--- a/src/bin/cross_validation.py
+++ b/src/bin/cross_validation.py
@@ -29,13 +29,16 @@ import datetime
 from config import Config
 from evaluation import CrossValidation, Precision, Recall, F1, Accuracy, SimpleAccuracy
 from recommender import Recommender
-from user import RandomPopcon
+from user import RandomPopcon,LocalSystem,PopconSystem
 
 if __name__ == '__main__':
     cfg = Config()
     rec = Recommender(cfg)
-    user = RandomPopcon(cfg.popcon_dir,os.path.join(cfg.filters,"desktop"))
-    user.filter_pkg_profile(os.path.join(cfg.filters,"desktop"))
+    #user = LocalSystem()
+    #user = RandomPopcon(cfg.popcon_dir)
+    #user = RandomPopcon(cfg.popcon_dir,os.path.join(cfg.filters_dir,"desktopapps"))
+    user = PopconSystem("/home/tassia/.app-recommender/popcon-entries/4a/4a67a295ec14826db2aa1d90be2f1623")
+    user.filter_pkg_profile(os.path.join(cfg.filters_dir,"desktopapps"))
     user.maximal_pkg_profile()
     begin_time = datetime.datetime.now()
 
@@ -45,7 +48,7 @@ if __name__ == '__main__':
     metrics.append(F1())
     metrics.append(Accuracy())
     metrics.append(SimpleAccuracy())
-    validation = CrossValidation(0.9,10,rec,metrics,0.01)
+    validation = CrossValidation(0.9,10,rec,metrics,0.005)
     validation.run(user)
     print validation
 
diff --git a/src/bin/get_desktop.sh b/src/bin/get_desktop.sh
index 4deb5e9..2f23a5c 100755
--- a/src/bin/get_desktop.sh
+++ b/src/bin/get_desktop.sh
@@ -3,4 +3,4 @@
 # get_desktop.sh - get packages which have desktop files 
 
 cd /usr/share/app-install/desktop
-sed -ne 's/X-AppInstall-Package=//p' * | sort -u
+sed -ne 's/X-AppInstall-Package=//p' * | sort -u | grep -v kdelibs | grep -v libfm-gtk0
diff --git a/src/bin/pkgindex.py b/src/bin/pkgindex.py
index 485213a..121701f 100755
--- a/src/bin/pkgindex.py
+++ b/src/bin/pkgindex.py
@@ -35,13 +35,14 @@ if __name__ == '__main__':
     cfg = Config()
     begin_time = datetime.datetime.now()
     logging.info("Sample package indexing started at %s" % begin_time)
-    with open(os.path.join(cfg.filters,cfg.pkgs_filter)) as valid:
+    with open(cfg.pkgs_filter) as valid:
         pkgs_list = [line.strip() for line in valid]
         logging.info("Packages list length: %d" % len(pkgs_list))
 
     # use config file or command line options
+    pkgs_filter = cfg.pkgs_filter.lstrip(cfg.filters_dir)
     pkgindex = data.SampleAptXapianIndex(pkgs_list,xapian.Database(cfg.axi),
-                                         cfg.axi+"-"+cfg.pkgs_filter)
+                                         os.path.join(cfg.base_dir,"axi_"+pkgs_filter))
     end_time = datetime.datetime.now()
     logging.info("Sample package indexing completed at %s" % end_time)
     logging.info("Number of documents (packages): %d" %
--
libgit2 0.21.2