diff --git a/cid3field.cpp b/cid3field.cpp
index ff803c0..0aba7c4 100644
--- a/cid3field.cpp
+++ b/cid3field.cpp
@@ -1,32 +1,14 @@
 #include "cID3Field.h"
 
 
-cID3Field::cID3Field(QObject *parent) :
-	QObject(parent), m_dwID(0), m_szShortName(""), m_szName(""), m_bValid(false)
+cID3Field::cID3Field(uint16_t dwID, const QString& szShortName, const QString& szName) :
+	m_dwID(dwID),
+	m_szShortName(szShortName),
+	m_szName(szName),
+	m_bValid(false)
 {
 }
 
-cID3Field::cID3Field(uint16_t dwID, QObject *parent) :
-	QObject(parent)
-{
-	m_dwID	= dwID;
-}
-
-cID3Field::cID3Field(uint16_t dwID, const QString& szShortName, QObject *parent) :
-	QObject(parent)
-{
-	m_dwID	= dwID;
-	setShortName(szShortName);
-}
-
-cID3Field::cID3Field(uint16_t dwID, const QString& szShortName, const QString& szName, QObject *parent) :
-	QObject(parent)
-{
-	m_dwID	= dwID;
-	setShortName(szShortName);
-	setName(szName);
-}
-
 cID3Field::~cID3Field()
 {
 	if(m_Value.canConvert<cPictureList*>())
@@ -117,7 +99,7 @@ cID3Field* cID3FieldList::add(uint16_t dwID, const QString& szShortName, const Q
 	if(lpID3Field)
 		return(lpID3Field);
 
-	lpID3Field	= new cID3Field(dwID, szShortName, szName, parent);
+	lpID3Field	= new cID3Field(dwID, szShortName, szName);
 	this->append(lpID3Field);
 	return(lpID3Field);
 }
diff --git a/cid3field.h b/cid3field.h
index 2ba554c..407021e 100644
--- a/cid3field.h
+++ b/cid3field.h
@@ -1,7 +1,6 @@
 #ifndef cID3Field_H
 #define cID3Field_H
 
-#include <QObject>
 #include <QString>
 #include <QVariant>
 #include <QPixmap>
@@ -12,7 +11,6 @@
 
 class cID3Field : public QObject
 {
-Q_OBJECT
 public:
 	enum TAG
 	{
@@ -32,40 +30,34 @@ public:
 		TAG_OfficialAudioSourceWebpage,	TAG_OfficialInternetRadioStationWebpage,	TAG_Payment,					TAG_PublishersOfficialWebpage,			TAG_UserDefinedURLLinkFrame,	TAG_MAXFIELDS,
 	};
 
-	explicit	cID3Field(QObject *parent = 0);
-	explicit	cID3Field(uint16_t dwID, QObject *parent = 0);
-	explicit	cID3Field(uint16_t dwID, const QString& szShortName, QObject *parent = 0);
-	explicit	cID3Field(uint16_t dwID, const QString& szShortName, const QString& szName, QObject *parent = 0);
+	explicit		cID3Field(uint16_t dwID = 0, const QString& szShortName = "", const QString& szName = "");
 	~cID3Field();
 
-	uint16_t	getID();
+	uint16_t		getID();
 
-	void		setShortName(const QString& szShortName);
-	QString		getShortName();
+	void			setShortName(const QString& szShortName);
+	QString			getShortName();
 
-	void		setName(const QString& szName);
-	QString		getName();
+	void			setName(const QString& szName);
+	QString			getName();
 
-	void		setValue(const QVariant& Value);
-	QVariant	getValue();
+	void			setValue(const QVariant& Value);
+	QVariant		getValue();
 
-	bool		isValid();
+	bool			isValid();
 
-	cID3Field&	operator=(const cID3Field& rhs);
-	inline bool	operator== (const cID3Field& other) const
+	cID3Field&		operator=(const cID3Field& rhs);
+	inline bool		operator== (const cID3Field& other) const
 	{
 		return(m_dwID == other.m_dwID);
 	}
-protected:
-	uint16_t	m_dwID;
-	QString		m_szShortName;
-	QString		m_szName;
-	QVariant	m_Value;
-	bool		m_bValid;
-signals:
-
-public slots:
 
+private:
+	uint16_t		m_dwID;
+	QString			m_szShortName;
+	QString			m_szName;
+	QVariant		m_Value;
+	bool			m_bValid;
 };
 
 Q_DECLARE_METATYPE(cID3Field*)
diff --git a/cmainwindow.cpp b/cmainwindow.cpp
index 3246292..5f09d47 100644
--- a/cmainwindow.cpp
+++ b/cmainwindow.cpp
@@ -61,11 +61,11 @@ cMainWindow::cMainWindow(QWidget *parent) :
 
 	QTime	time;
 	time.start();
-	addPath("C:/Users/birkeh/Music");
-	qDebug() << time.elapsed();
-//	addPath("C:/Users/vet0572/Music");
 //	addPath("C:/Users/birkeh/Music");
-	addFile("C:/Users/vet0572/Music/Amy MacDonald/Under Stars (Deluxe)/01 - Dream On.mp3");
+	addPath("C:/Users/vet0572/Music");
+	qDebug() << time.elapsed();
+//	addPath("C:/Users/birkeh/Music");
+//	addFile("C:/Users/vet0572/Music/Amy MacDonald/Under Stars (Deluxe)/01 - Dream On.mp3");
 }
 
 cMainWindow::~cMainWindow()
diff --git a/cmediainfo.cpp b/cmediainfo.cpp
index 9296b65..86e2c52 100644
--- a/cmediainfo.cpp
+++ b/cmediainfo.cpp
@@ -14,6 +14,7 @@ extern "C" {
 #include "libmpg123/mpg123.h"
 }
 
+
 cMediaInfo::cMediaInfo(QObject *parent) :
 	QObject(parent),
 	m_szFileName(""),
@@ -28,6 +29,12 @@ cMediaInfo::cMediaInfo(QObject *parent) :
 	initFields();
 }
 
+cMediaInfo::~cMediaInfo()
+{
+	for(int x = 0;x < m_ID3FieldList.count();x++)
+		delete (m_ID3FieldList.at(x));
+}
+
 void cMediaInfo::clear()
 {
 	m_szFileName	= "";
diff --git a/cmediainfo.h b/cmediainfo.h
index a053a3a..076e093 100644
--- a/cmediainfo.h
+++ b/cmediainfo.h
@@ -18,6 +18,7 @@ class cMediaInfo : public QObject
 Q_OBJECT
 public:
 	explicit		cMediaInfo(QObject *parent = 0);
+	~cMediaInfo();
 
 	void			clear();
 
diff --git a/qtMusic.pro b/qtMusic.pro
index 0ba17cc..03573b6 100644
--- a/qtMusic.pro
+++ b/qtMusic.pro
@@ -89,3 +89,6 @@ LIBS += -lz
 
 FORMS += \
         cmainwindow.ui
+
+DISTFILES += \
+    libid3tag/genre.dat