diff --git a/TODO b/TODO
index 41623995f..b8ef1f0a2 100644
--- a/TODO
+++ b/TODO
@@ -10,6 +10,7 @@
 - Allow user to organize the downloads into categories/folders
 - Display new searches in new tabs
 - Display a progress bar that really displays the pieces we have (like in eMule)
+- .ico support (unsupported by Qt4.3 Free edition)
 
 // Waiting for libtorrent
 - File selection in a torrent in compact mode
@@ -18,11 +19,8 @@
 // Unsure
 - Azureus spoofing to prevent ban from trackers?
 - Web interface?
-- Allow to set upload limit for each torrent
 - Option to shutdown computer when downloads are finished
 - Add a torrent scheduler
-- Improve Ipfilter.dat parser (move to a thread ? - too slow to load qBT and more importantly options)
-- Improve search plugin update (make it automatic, write version/changelog in another file to limit brandwidth usage). Allow to disable this feature in program preferences.
 - Make use of dbus on Linux for the single instance instead of socket communication?
   (http://techbase.kde.org/Development/Tutorials/D-Bus/Accessing_Interfaces)
 
@@ -44,9 +42,8 @@
 * beta3
   - Windows port (Chris - Peerkoel)
   - Translations update
-  - .ico support?
-  - Download/Finished lists cleanup
-  - Move transfer lists refreshers to threads
+  - Move transfer lists refreshers to threads?
+  - Optimize and cleanup code
   - Wait for some bug fixes in libtorrent :
     - upload/download limit per torrent
     - ipfilter crash
diff --git a/configure b/configure
index ea6a8b302..8e054fecb 100755
--- a/configure
+++ b/configure
@@ -10,11 +10,12 @@ Usage: $0 [OPTION]...
 This script creates necessary configuration files to build/install.
 
 Main options:
-  --prefix=[path]    Base path for build/install.  Default: /usr/local
-  --bindir=[path]    Directory for binaries.  Default: PREFIX/bin
-  --qtdir=[path]     Directory where Qt is installed.
-  --verbose          Show extra configure output.
-  --help             This help text.
+  --prefix=[path]     Base path for build/install.  Default: /usr/local
+  --bindir=[path]     Directory for binaries.  Default: PREFIX/bin
+  --datadir=[path]    Directory for data.  Default: PREFIX/share
+  --qtdir=[path]      Directory where Qt is installed.
+  --verbose           Show extra configure output.
+  --help              This help text.
 
 Dependency options:
   --with-libtorrent-inc=[path]            Path to libtorrent include files
@@ -129,6 +130,11 @@ while [ $# -gt 0 ]; do
 			shift
 			;;
 
+		--datadir=*)
+			DATADIR=$optarg
+			shift
+			;;
+
 		--qtdir=*)
 			EX_QTDIR=$optarg
 			shift
@@ -175,6 +181,7 @@ done
 
 PREFIX=${PREFIX:-/usr/local}
 BINDIR=${BINDIR:-$PREFIX/bin}
+DATADIR=${DATADIR:-$PREFIX/share}
 
 echo "Configuring qbittorrent ..."
 
@@ -182,6 +189,7 @@ if [ "$QC_DEBUG" = "Y" ]; then
 echo
 echo PREFIX=$PREFIX
 echo BINDIR=$BINDIR
+echo DATADIR=$DATADIR
 echo EX_QTDIR=$EX_QTDIR
 echo QC_WITH_LIBTORRENT_INC=$QC_WITH_LIBTORRENT_INC
 echo QC_WITH_LIBTORRENT_LIB=$QC_WITH_LIBTORRENT_LIB
@@ -430,7 +438,7 @@ class qc_libcommoncpp2 : public ConfObj
 {
 public:
 	qc_libcommoncpp2(Conf *c) : ConfObj(c) {}
-	QString name() const { return "GNU Common C++"; }
+	QString name() const { return "GNU Common C++ library (libcommoncpp2)"; }
 	QString shortname() const { return "libcommoncpp2"; }
 	bool exec(){
     QString s;
@@ -1454,6 +1462,7 @@ EOT
 
 export PREFIX
 export BINDIR
+export DATADIR
 export EX_QTDIR
 export QC_WITH_LIBTORRENT_INC
 export QC_WITH_LIBTORRENT_LIB
diff --git a/qcm/libcommoncpp2.qcm b/qcm/libcommoncpp2.qcm
index 91fdfd70e..12db1ab74 100644
--- a/qcm/libcommoncpp2.qcm
+++ b/qcm/libcommoncpp2.qcm
@@ -9,7 +9,7 @@ class qc_libcommoncpp2 : public ConfObj
 {
 public:
 	qc_libcommoncpp2(Conf *c) : ConfObj(c) {}
-	QString name() const { return "GNU Common C++"; }
+	QString name() const { return "GNU Common C++ library (libcommoncpp2)"; }
 	QString shortname() const { return "libcommoncpp2"; }
 	bool exec(){
     QString s;