diff --git a/!TheEsc/!MapEdit,ff8 b/!TheEsc/!MapEdit,ff8
index 4a0ff47..dcbf90b 100644
Binary files a/!TheEsc/!MapEdit,ff8 and b/!TheEsc/!MapEdit,ff8 differ
diff --git a/!TheEsc/!RunImage,ff8 b/!TheEsc/!RunImage,ff8
index b5639b9..e6387f9 100644
Binary files a/!TheEsc/!RunImage,ff8 and b/!TheEsc/!RunImage,ff8 differ
diff --git a/!TheEsc/Makefile,fe1 b/!TheEsc/Makefile,fe1
index efe2412..bd9e92a 100644
--- a/!TheEsc/Makefile,fe1
+++ b/!TheEsc/Makefile,fe1
@@ -40,27 +40,27 @@ Squeezeflags = -o $@
 
 
 # Dynamic dependencies:
-o.CTheEscape:	c.CTheEscape
-o.CTheEscape:	C:h.swis
-o.CTheEscape:	C:h.kernel
-o.CTheEscape:	C:h.kernel
-o.CTheEscape:	h.Sound
-o.CTheEscape:	h.Graphics
 o.Graphics:	c.Graphics
 o.Graphics:	C:h.swis
 o.Graphics:	C:h.kernel
 o.Graphics:	C:h.kernel
-o.Sound:	c.Sound
-o.Sound:	C:h.swis
-o.Sound:	C:h.kernel
-o.Sound:	C:h.kernel
-o.Sound:	h.Sound
 o.Input:	c.Input
 o.Input:	C:h.swis
 o.Input:	C:h.kernel
 o.Input:	C:h.kernel
 o.Intro:	c.Intro
 o.Intro:	h.Graphics
+o.CTheEscape:	c.CTheEscape
+o.CTheEscape:	C:h.swis
+o.CTheEscape:	C:h.kernel
+o.CTheEscape:	C:h.kernel
+o.CTheEscape:	h.Sound
+o.CTheEscape:	h.Graphics
+o.Sound:	c.Sound
+o.Sound:	C:h.swis
+o.Sound:	C:h.kernel
+o.Sound:	C:h.kernel
+o.Sound:	h.Sound
 o.Mission1:	c.Mission1
 o.Mission1:	h.Graphics
 o.Mission2:	c.Mission2
diff --git a/!TheEsc/Tools,fe1 b/!TheEsc/Tools,fe1
index d6b59ab..0052b8d 100644
--- a/!TheEsc/Tools,fe1
+++ b/!TheEsc/Tools,fe1
@@ -51,6 +51,12 @@ o.Mission2:	h.Graphics
 o.Mission2:	C:h.swis
 o.Mission2:	C:h.kernel
 o.Mission2:	C:h.kernel
+o.MapEdit:	c.MapEdit
+o.MapEdit:	C:h.swis
+o.MapEdit:	C:h.kernel
+o.MapEdit:	C:h.kernel
+o.MapEdit:	h.Sound
+o.MapEdit:	h.Graphics
 o.Graphics:	c.Graphics
 o.Graphics:	C:h.swis
 o.Graphics:	C:h.kernel
@@ -59,9 +65,3 @@ o.Input:	c.Input
 o.Input:	C:h.swis
 o.Input:	C:h.kernel
 o.Input:	C:h.kernel
-o.MapEdit:	c.MapEdit
-o.MapEdit:	C:h.swis
-o.MapEdit:	C:h.kernel
-o.MapEdit:	C:h.kernel
-o.MapEdit:	h.Sound
-o.MapEdit:	h.Graphics
diff --git a/!TheEsc/c/MapEdit b/!TheEsc/c/MapEdit
index 2c5108a..33fcb58 100644
--- a/!TheEsc/c/MapEdit
+++ b/!TheEsc/c/MapEdit
@@ -25,17 +25,10 @@ unsigned char *buffer;
 unsigned char *fontbuffer;
 unsigned char *tilebuffer;
 
-extern int screen;
-extern struct CompositionElement composition[128];
-extern int current_element;
-int lastprofile = 0;
-
 int tick = 0;
 int lasttick = 0;
 extern int screen;
 
-extern int game1_tick();
-extern void game1_setup();
 extern void screen_nobuffer();
 
 
diff --git a/!TheEsc/c/Mission2 b/!TheEsc/c/Mission2
index df6a6a7..a8a78ff 100644
--- a/!TheEsc/c/Mission2
+++ b/!TheEsc/c/Mission2
@@ -248,11 +248,11 @@ int game2_tick()
       }
     }
 
-    draw_sprite("lcarsblack",1000,DISPLAY_Y-164);
+/*    draw_sprite("lcarsblack",1000,DISPLAY_Y-164);
 
     TilePlayer.rawtile = (TilePlayer.mapoffset.Y) + TilePlayer.localtile.Y + (TilePlayer.mapoffset.X * 100) + (TilePlayer.localtile.X * 100);
     sprintf(textbuffer,"Tile:%i\nSprite:%i",TilePlayer.rawtile,fullmap[TilePlayer.rawtile]);
-    draw_spritetext(textbuffer, 1070, 950);
+    draw_spritetext(textbuffer, 1070, 950);*/
 
     game2_tick_input();