diff --git a/G3DTest.vcproj b/G3DTest.vcproj
index ab76dd8..6ef896f 100644
--- a/G3DTest.vcproj
+++ b/G3DTest.vcproj
@@ -144,7 +144,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;C:\Users\Andreja\Documents\C++\G3D-Fun\src\include\DataModel&quot;;&quot;C:\Users\Andreja\Documents\C++\G3D-Fun\src\include&quot;"
+				AdditionalIncludeDirectories="&quot;C:\Users\Andreja\Documents\C++\G3D-Fun\src\include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="0"
diff --git a/src/include/Listener/ButtonListener.h b/src/include/Listener/ButtonListener.h
index b334c63..4ac7aa2 100644
--- a/src/include/Listener/ButtonListener.h
+++ b/src/include/Listener/ButtonListener.h
@@ -1,6 +1,6 @@
 #pragma once
 //#include "Application.h"
-#include "BaseButtonInstance.h"
+#include "DataModel/BaseButtonInstance.h"
 
 class BaseButtonInstance;
 
diff --git a/src/source/DataModel/PVInstance.cpp b/src/source/DataModel/PVInstance.cpp
index 9058bf5..8bdf6af 100644
--- a/src/source/DataModel/PVInstance.cpp
+++ b/src/source/DataModel/PVInstance.cpp
@@ -42,6 +42,7 @@ static TCHAR* enumStr(int controller)
 		case Enum::Controller::Flee:
 			return "Joypad2";
 	}
+	return "None";
 }
 
 static Enum::Controller::Value strEnum(TCHAR * tval)
@@ -93,11 +94,11 @@ void PVInstance::PropUpdate(LPPROPGRIDITEM &pItem)
 {
 	if(strcmp(pItem->lpszPropName, "NameShown") == 0)
 	{
-		nameShown = (bool)pItem->lpCurValue;
+		nameShown = pItem->lpCurValue == TRUE;
 	}
 	if(strcmp(pItem->lpszPropName, "ControllerFlagShown") == 0)
 	{
-		controllerFlagShown = (bool)pItem->lpCurValue;
+		controllerFlagShown = pItem->lpCurValue == TRUE;
 	}
 	if(strcmp(pItem->lpszPropName, "Controller") == 0)
 	{
diff --git a/src/source/Listener/ButtonListener.cpp b/src/source/Listener/ButtonListener.cpp
index 510476e..74799f2 100644
--- a/src/source/Listener/ButtonListener.cpp
+++ b/src/source/Listener/ButtonListener.cpp
@@ -1,4 +1,4 @@
-#include "BaseButtonInstance.h"
+#include "DataModel/BaseButtonInstance.h"
 #include "Listener/ButtonListener.h"
 
 
diff --git a/src/source/Listener/MenuButtonListener.cpp b/src/source/Listener/MenuButtonListener.cpp
index 779bd80..fe585d3 100644
--- a/src/source/Listener/MenuButtonListener.cpp
+++ b/src/source/Listener/MenuButtonListener.cpp
@@ -1,5 +1,5 @@
 #include "Listener/MenuButtonListener.h"
-#include "toggleimagebuttoninstance.h"
+#include "DataModel/ToggleImageButtonInstance.h"
 #include "Globals.h"
 void MenuButtonListener::onButton1MouseClick(BaseButtonInstance* button)
 {
diff --git a/src/source/Listener/ModeSelectionListener.cpp b/src/source/Listener/ModeSelectionListener.cpp
index fac7a17..336fbab 100644
--- a/src/source/Listener/ModeSelectionListener.cpp
+++ b/src/source/Listener/ModeSelectionListener.cpp
@@ -1,5 +1,5 @@
 #include "Globals.h"
-#include "Instance.h"
+#include "DataModel/Instance.h"
 #include "Listener/ModeSelectionListener.h"
 #include "Application.h"
 #include "Tool/ArrowTool.h"
diff --git a/src/source/Listener/RotateButtonListener.cpp b/src/source/Listener/RotateButtonListener.cpp
index b9f0ea4..4c655bb 100644
--- a/src/source/Listener/RotateButtonListener.cpp
+++ b/src/source/Listener/RotateButtonListener.cpp
@@ -1,4 +1,4 @@
-#include "BaseButtonInstance.h"
+#include "DataModel/BaseButtonInstance.h"
 #include "Listener/RotateButtonListener.h"
 #include "Globals.h"
 #include "AudioPlayer.h"