diff --git a/backend_xmmsclient++/playlistmodel.cpp b/backend_xmmsclient++/playlistmodel.cpp
index ec09107..6bbfea0 100644
--- a/backend_xmmsclient++/playlistmodel.cpp
+++ b/backend_xmmsclient++/playlistmodel.cpp
@@ -37,10 +37,12 @@ PlaylistModel::PlaylistModel (QObject *parent, XClient *client, const QString &n
 {
 //	m_columns.append ("#");
 	m_columns.append ("Artist");
+	m_columns.append ("Album");
 	m_columns.append ("Title");
 	m_columns.append ("Duration");
 
 //	m_colfallback.append ("");
+	m_colfallback.append ("");
 	m_colfallback.append ("");
 	m_colfallback.append ("url");
 	m_colfallback.append ("");
diff --git a/backend_xmmsclient++/wscript b/backend_xmmsclient++/wscript
index dcad64c..2929f79 100644
--- a/backend_xmmsclient++/wscript
+++ b/backend_xmmsclient++/wscript
@@ -53,9 +53,10 @@ def build(bld):
     obj                 = bld.new_task_gen(features='qt4 cstaticlib cxx')
     obj.target          = 'backend_lib'
     obj.install_path    = 0 # Don't install
-    obj.includes        = '.'
+    obj.includes        = ['.', '/usr/include/QtGui', '/usr/include/QtCore', '/usr/include/xmms2']
     obj.source          = lib_source
-    obj.uselib          = 'QTCORE QTGUI XMMS2-CLIENT-CPP'
+    obj.uselib          = 'libQtCore libQtGui XMMS2-CLIENT-CPP'
     obj.export_incdirs  = '.'
+    print dir(obj)
     pass
 
diff --git a/dir_iterator/wscript b/dir_iterator/wscript
index 88d03ee..f9b6775 100644
--- a/dir_iterator/wscript
+++ b/dir_iterator/wscript
@@ -57,7 +57,7 @@ def build(bld):
     obj                 = bld.new_task_gen(features='qt4 cstaticlib cxx')
     obj.target          = 'dir_iterator'
     obj.install_path    = 0 # Don't install
-    obj.includes        = '.'
+    obj.includes        = ['.', '/usr/include/QtCore', '/usr/include/QtGui']
     obj.source          = sources
     obj.uselib          = 'QTCORE QTGUI LIBARCHIVE'
     obj.export_incdirs  = '.'
diff --git a/src/playlist/playlistview.cpp b/src/playlist/playlistview.cpp
index 4166fd6..ab8b3ee 100644
--- a/src/playlist/playlistview.cpp
+++ b/src/playlist/playlistview.cpp
@@ -70,7 +70,7 @@ PlaylistDelegate::paint( QPainter *painter, const QStyleOptionViewItem& option,
 	QRect r = option.rect;
 	QString s;
 	// Get playtime and if it exists, draw it
-	m = index.sibling (index.row (), 2);
+	m = index.sibling (index.row (), 3);
 	tmp = m.data ();
 	if (tmp.isValid ()) {
 		int seconds = tmp.toInt () / 1000;
@@ -88,6 +88,11 @@ PlaylistDelegate::paint( QPainter *painter, const QStyleOptionViewItem& option,
 		s.append (tmp.toString ()).append (" - ");
 	m = index.sibling (index.row (), 1);
 	tmp = m.data ();
+	if (tmp.isValid ())
+		s.append (tmp.toString ().append (" - "));
+
+	m = index.sibling (index.row (), 2);
+	tmp = m.data ();
 	if (tmp.isValid ())
 		s.append (tmp.toString ());
 	s = option.fontMetrics.elidedText(s, Qt::ElideRight, r.width());
diff --git a/src/wscript b/src/wscript
index a0b3329..748ab59 100644
--- a/src/wscript
+++ b/src/wscript
@@ -60,8 +60,8 @@ def files_subdirs(subdirs, filters = ['.cpp', '.ui'], basedir='.'):
     for dir in subdirs:
         d = os.path.join(basedir, dir)
         for file in os.listdir(d):
-            for filter in filters:
-                if file.endswith(filter):
+            for filt in filters:
+                if file.endswith(filt):
                     ret.append(os.path.join(dir, file))
 
     return ret
@@ -92,6 +92,10 @@ def build(bld):
 
     incdirs = bld_subdirs
     incdirs.append('.')
+    incdirs.append('/usr/include/QtCore')
+    incdirs.append('/usr/include/QtGui')
+    incdirs.append('/usr/include/QtNetwork')
+    incdirs.append('/usr/include/xmms2')
 
     obj              = bld.new_task_gen(features='qt4 cprogram cxx')
     obj.target       = 'promoe'
@@ -99,6 +103,6 @@ def build(bld):
     obj.source       = sources
     obj.uselib_local = 'backend_lib dir_iterator'
     obj.add_objects  = 'promoe_data'
-    obj.uselib       = 'QTCORE QTGUI AVAHI-CLIENT AVAHI-QT4'
+    obj.uselib       = 'QtCore QtGui AVAHI-CLIENT AVAHI-QT4'
     pass
 
diff --git a/waf b/waf
index b79b392..f8106e2 100755
Binary files a/waf and b/waf differ