diff --git a/tools/Forge/Bundles/MapEdit/MapEdit.gorm/data.classes b/tools/Forge/Bundles/MapEdit/MapEdit.gorm/data.classes
index 5b141bab6..f79dd054d 100644
--- a/tools/Forge/Bundles/MapEdit/MapEdit.gorm/data.classes
+++ b/tools/Forge/Bundles/MapEdit/MapEdit.gorm/data.classes
@@ -74,6 +74,7 @@
 	    "setCurrentProject:",
 	    "setFlags:",
 	    "setModeRadio:",
+	    "setParent:",
 	    "setXYRegion:",
 	    "shortBrush:",
 	    "subtractSelection:",
@@ -226,6 +227,15 @@
 	);
 	Super = NSObject;
     };
+    TextureView = {
+	Actions = (
+	    "setParent:"
+	);
+	Outlets = (
+	    parent_i
+	);
+	Super = NSView;
+    };
     Things = {
 	Actions = (
 	    "reloadEntityClasses:",
diff --git a/tools/Forge/Bundles/MapEdit/MapEdit.gorm/objects.gorm b/tools/Forge/Bundles/MapEdit/MapEdit.gorm/objects.gorm
index 730715d71..3b3a5c8d6 100644
Binary files a/tools/Forge/Bundles/MapEdit/MapEdit.gorm/objects.gorm and b/tools/Forge/Bundles/MapEdit/MapEdit.gorm/objects.gorm differ
diff --git a/tools/Forge/Bundles/MapEdit/QuakeEd.m b/tools/Forge/Bundles/MapEdit/QuakeEd.m
index d0465e67b..d457eeb92 100644
--- a/tools/Forge/Bundles/MapEdit/QuakeEd.m
+++ b/tools/Forge/Bundles/MapEdit/QuakeEd.m
@@ -306,7 +306,11 @@ App delegate methods
 		postappdefined ();
 		return self;
 	}
-	Sys_Printf ("updating %d %d\n", (int)[map_i count], (int)[[map_i currentEntity] count]);
+	Sys_Printf ("updating %d %d %p %d %p %d\n",
+				(int)[map_i count],
+				(int)[[map_i currentEntity] count],
+				entitycount_i, [entitycount_i intValue],
+				brushcount_i, [brushcount_i intValue]);
 
 
 	[self disableFlushWindow];
diff --git a/tools/Forge/Bundles/MapEdit/TexturePalette.m b/tools/Forge/Bundles/MapEdit/TexturePalette.m
index bffea9565..0b9420724 100644
--- a/tools/Forge/Bundles/MapEdit/TexturePalette.m
+++ b/tools/Forge/Bundles/MapEdit/TexturePalette.m
@@ -163,7 +163,6 @@ void
 TEX_InitFromWad (char *path)
 {
 	int         i;
-	char        local[1024];
 	char        newpath[1024];
 	float       start, stop;
 	wad_t      *wad;
@@ -189,7 +188,6 @@ TEX_InitFromWad (char *path)
 	lumpinfo = wad->lumps;
 
 	if (strcmp (lumpinfo->name, "PALETTE")) {
-		unlink (local);
 		Sys_Error ("TEX_InitFromWad: %s doesn't have palette as 0", path);
 	}
 
@@ -207,7 +205,7 @@ TEX_InitFromWad (char *path)
 
 	stop = Sys_DoubleTime ();
 
-	Sys_Printf ("loaded %s (%5.1f)\n", local, stop - start);
+	Sys_Printf ("loaded %s (%5.1f)\n", newpath, stop - start);
 }
 
 /*
@@ -273,9 +271,9 @@ TEX_ForName (char *name)
 	if (textureList_i)
 		[textureList_i empty];
 	else
-		textureList_i =[[Storage alloc]
-		initCount: 0 elementSize:sizeof (texpal_t)
-		description:		NULL];
+		textureList_i = [[Storage alloc] initCount: 0
+									   elementSize: sizeof (texpal_t)
+									   description: NULL];
 
 	// Init STORAGE