diff --git a/JA2.suo b/JA2.suo
index 7c4ff632d..355a3236d 100644
Binary files a/JA2.suo and b/JA2.suo differ
diff --git a/Laptop/florist Gallery.cpp b/Laptop/florist Gallery.cpp
index c06b12323..928637115 100644
--- a/Laptop/florist Gallery.cpp	
+++ b/Laptop/florist Gallery.cpp	
@@ -34,20 +34,20 @@
 #define	FLOR_GALLERY_FLOWER_DESC_TEXT_FONT		FONT12ARIAL
 #define	FLOR_GALLERY_FLOWER_DESC_TEXT_COLOR		FONT_MCOLOR_WHITE
 
-#define FLOR_GALLERY_BACK_BUTTON_X						LAPTOP_SCREEN_UL_X + 8
+#define FLOR_GALLERY_BACK_BUTTON_X						(LAPTOP_SCREEN_UL_X + 8)
 #define FLOR_GALLERY_BACK_BUTTON_Y						LAPTOP_SCREEN_WEB_UL_Y + 12
 
 #define FLOR_GALLERY_NEXT_BUTTON_X						LAPTOP_SCREEN_UL_X + 420
 #define FLOR_GALLERY_NEXT_BUTTON_Y						FLOR_GALLERY_BACK_BUTTON_Y
 	
-#define FLOR_GALLERY_FLOWER_BUTTON_X					LAPTOP_SCREEN_UL_X + 7
+#define FLOR_GALLERY_FLOWER_BUTTON_X					(LAPTOP_SCREEN_UL_X + 7)
 #define FLOR_GALLERY_FLOWER_BUTTON_Y					LAPTOP_SCREEN_WEB_UL_Y + 74
 
 #define FLOR_GALLERY_FLOWER_BUTTON_OFFSET_Y		112
 
-#define FLOR_GALLERY_TITLE_TEXT_X							LAPTOP_SCREEN_UL_X + 0
+#define FLOR_GALLERY_TITLE_TEXT_X							(LAPTOP_SCREEN_UL_X + 0)
 #define FLOR_GALLERY_TITLE_TEXT_Y							LAPTOP_SCREEN_WEB_UL_Y + 48
-#define FLOR_GALLERY_TITLE_TEXT_WIDTH						613 - 611 
+#define FLOR_GALLERY_TITLE_TEXT_WIDTH						(613 - 111)	
 
 #define FLOR_GALLERY_FLOWER_TITLE_X						FLOR_GALLERY_FLOWER_BUTTON_X + 88
 
diff --git a/builddefines.h b/builddefines.h
index f11a2e8f5..142d3b347 100644
--- a/builddefines.h
+++ b/builddefines.h
@@ -15,14 +15,14 @@
 // Debug version of the editor!
 //#define JA2EDITOR
 
-/*
+
 // Editor
 #ifdef _DEBUG
 	#ifndef JA2TESTVERSION
 		#define JA2TESTVERSION
 	#endif
 #endif
-*/
+
 
 // Do combinations
 #ifdef JA2TESTVERSION