diff --git a/C++ProjectTemplate b/C++ProjectTemplate
index 9eed648..c6ef6f0 100755
Binary files a/C++ProjectTemplate and b/C++ProjectTemplate differ
diff --git a/main.cpp b/main.cpp
index f1a0010..b23f577 100644
--- a/main.cpp
+++ b/main.cpp
@@ -107,8 +107,8 @@ public:
 	int frameCount=0;
 	float elapsedTime=0;
 	const float TARGET_RATE = 1/60.0;
-	int MAP_WIDTH;
-	int MAP_HEIGHT;
+	int MAP_WIDTH=-1;
+	int MAP_HEIGHT=-1;
 	Map*CURRENT_MAP;
 	Map*MAP_ONETT;
 	vd2d cameraPos = {0,0};
@@ -512,26 +512,26 @@ public:
 			}
 			MAP[i].clear();
 		}
-		for (int i=0;i<MAP2.size();i++) {
-			for (int j=0;j<MAP2[i].size();j++) {
+		for (int i=0;i<MAP.size();i++) {
+			for (int j=0;j<MAP[i].size();j++) {
 				delete MAP2[i][j];
 			}
 			MAP2[i].clear();
 		}
-		for (int i=0;i<MAP3.size();i++) {
-			for (int j=0;j<MAP3[i].size();j++) {
+		for (int i=0;i<MAP.size();i++) {
+			for (int j=0;j<MAP[i].size();j++) {
 				delete MAP3[i][j];
 			}
 			MAP3[i].clear();
 		}
-		for (int i=0;i<MAP4.size();i++) {
-			for (int j=0;j<MAP4[i].size();j++) {
+		for (int i=0;i<MAP.size();i++) {
+			for (int j=0;j<MAP[i].size();j++) {
 				delete MAP4[i][j];
 			}
 			MAP4[i].clear();
 		}
-		for (int i=0;i<MAP5.size();i++) {
-			for (int j=0;j<MAP5[i].size();j++) {
+		for (int i=0;i<MAP.size();i++) {
+			for (int j=0;j<MAP[i].size();j++) {
 				delete MAP5[i][j];
 			}
 			MAP5[i].clear();
@@ -539,12 +539,16 @@ public:
 		MAP_WIDTH=-1;
 		MAP_HEIGHT=-1;
 		MAP.clear();
+		for (int i=0;i<OBJECTS.size();i++) {
+			delete OBJECTS[i];
+		}
+		OBJECTS.clear();
+		PLAYER_OBJ=nullptr;
 		std::string data;
 		while (f.good()) {
 			f>>data;
 			if (MAP_WIDTH==-1) {
 				MAP_WIDTH=data.length()/2;
-				printf("Map Width: %d\n",MAP_WIDTH);
 			}
 			if (data.find("OBJECT")!=std::string::npos) {
 				int marker=data.find_first_of(';');
@@ -636,6 +640,8 @@ public:
 			}
 			MAP5.push_back(tiles);
 		}
+		MAP_WIDTH=MAP[0].size();
+		MAP_HEIGHT=MAP.size();
 		printf("Loaded map %s.\n",map->filename.c_str());
 		f.close();
 		f2.close();
@@ -927,12 +933,14 @@ public:
 			}
 		}
 		
-		printf("OBJECTS (%d):\n",OBJECTS.size());
+		//printf("OBJECTS (%d):\n",OBJECTS.size());
 		for (int i=0;i<OBJECTS.size();i++) {
-			printf("%d ::  Object %s - %d (%lf,%lf)\n",i,OBJECTS[i]->name.c_str(),OBJECTS[i]->objArrElement,OBJECTS[i]->pos.x,OBJECTS[i]->pos.y);
+			if (i!=OBJECTS[i]->objArrElement) {
+				printf("%d ::  Object %s - %d (%lf,%lf)\n",i,OBJECTS[i]->name.c_str(),OBJECTS[i]->objArrElement,OBJECTS[i]->pos.x,OBJECTS[i]->pos.y);
+			}
 			assert(i==OBJECTS[i]->objArrElement);
 		}
-		printf("\n");
+		//printf("\n");
 	}