diff --git a/cmainwindow.cpp b/cmainwindow.cpp
index 82f8fc6..5b219ec 100644
--- a/cmainwindow.cpp
+++ b/cmainwindow.cpp
@@ -98,11 +98,12 @@ cMainWindow::cMainWindow(QWidget *parent) :
 	connect(ui->m_lpMusicListOriginal->verticalScrollBar(), &QScrollBar::valueChanged, this, &cMainWindow::onScrollbarValueChangedOriginal);
 	connect(ui->m_lpMusicListNew->verticalScrollBar(), &QScrollBar::valueChanged, this, &cMainWindow::onScrollbarValueChangedNew);
 
-//	loadDB();
-//	displayDB();
+	loadDB();
+	displayDB();
 
 //	addPath("/data/Music");
-	addPath("C:/Users/vet0572/Music");
+//	addPath("C:/Users/vet0572/Music");
+//	addPath("C:/Temp/Musik");
 //	addPath("C:/Users/birkeh/Music");
 //	addFile("C:/Users/vet0572/Music/Amy MacDonald/Under Stars (Deluxe)/01 - Dream On.mp3");
 }
diff --git a/common.h b/common.h
index 1fc92ad..15ac39f 100644
--- a/common.h
+++ b/common.h
@@ -12,7 +12,8 @@
 #include <QDebug>
 
 
-#define myDebug qDebug() << __FILE__ << "(" << __LINE__ << ") - " << __PRETTY_FUNCTION__ << ":"
+//#define myDebug qDebug() << __FILE__ << "(" << __LINE__ << ") - " << __PRETTY_FUNCTION__ << ":"
+#define myDebug qDebug() << __FILE__ << "(" << __LINE__ << ") - " << __FUNCTION__ << ":"
 
 
 #endif // COMMON_H
diff --git a/qtJukeBox.pro b/qtJukeBox.pro
index 4a6d352..3630d4e 100644
--- a/qtJukeBox.pro
+++ b/qtJukeBox.pro
@@ -12,14 +12,29 @@ TARGET = qtJukeBox
 TEMPLATE = app
 
 
-win32 {
-INCLUDEPATH += "C:/dev/3rdParty/taglib/include"
-DEPENDPATH += "C:/dev/3rdParty/taglib/include"
-LIBS += "C:/dev/3rdParty/taglib/lib/libtag.dll.a"
+win32-msvc* {
+    contains(QT_ARCH, i386) {
+        message("msvc 32-bit")
+        INCLUDEPATH += "C:/dev/3rdParty/taglib-msvc32/include"
+        DEPENDPATH += "C:/dev/3rdParty/taglib-msvc32/include"
+        LIBS += -l"C:/dev/3rdParty/taglib-msvc32/lib/tag.lib"
+    } else {
+        message("msvc 64-bit")
+        INCLUDEPATH += "C:/dev/3rdParty/taglib-msvc64/include"
+        DEPENDPATH += "C:/dev/3rdParty/taglib-msvc64/include"
+        LIBS += -l"C:/dev/3rdParty/taglib-msvc64/lib/tag.lib"
+    }
+}
+
+win32-g++ {
+    message("mingw")
+    INCLUDEPATH += "C:/dev/3rdParty/taglib/include"
+    DEPENDPATH += "C:/dev/3rdParty/taglib/include"
+    LIBS += -l"C:/dev/3rdParty/taglib/lib/libtag.dll.a"
 }
 
 unix {
-LIBS	+= -ltag
+    LIBS	+= -ltag
 }
 
 SOURCES += main.cpp\