diff --git a/Data/Spawns/traps.map b/Data/Spawns/traps.map
index 3fe50c5..33095a3 100644
--- a/Data/Spawns/traps.map
+++ b/Data/Spawns/traps.map
@@ -192,7 +192,6 @@
 *|firecolumntrap:flamespurttrap:gastrap:giantspiketrap||||||3056|492|0|1|5|10|-1|10|1|2|0|0|0|0|0
 *|firecolumntrap:flamespurttrap:gastrap:giantspiketrap||||||3081|368|0|1|5|10|-1|10|1|2|0|0|0|0|0
 *|firecolumntrap:flamespurttrap:gastrap:giantspiketrap||||||3048|379|0|1|5|10|-1|10|1|2|0|0|0|0|0
-*|firecoumntrap:flamespurttrap:gastrap:giantspiketrap||||||3031|392|3|1|5|10|-1|10|1|2|0|0|0|0|0
 *|firecolumntrap:flamespurttrap:gastrap:giantspiketrap||||||3149|370|0|1|5|10|-1|10|1|2|0|0|0|0|0
 *|firecolumntrap:flamespurttrap:gastrap:giantspiketrap||||||3126|368|1|1|5|10|-1|10|1|2|0|0|0|0|0
 *|firecolumntrap:flamespurttrap:gastrap:giantspiketrap||||||3102|374|2|1|5|10|-1|10|1|2|0|0|0|0|0
diff --git a/Scripts/Commands/BuildWorld.cs b/Scripts/Commands/BuildWorld.cs
index 6501b4f..aa4ed29 100644
--- a/Scripts/Commands/BuildWorld.cs
+++ b/Scripts/Commands/BuildWorld.cs
@@ -36,7 +36,7 @@ namespace Server.Scripts.Commands
 
         public static void DoWipe( Mobile m )
         {
-            m.SendMessage( 38, "Removing ALL Spawners and wild mobs... This may take a moment." );
+            m.SendMessage( "Removing ALL Spawners and wild mobs... This may take a moment." );
             Console.WriteLine( "Removing Spawners..." );
 
             ArrayList targets = new ArrayList();
@@ -74,24 +74,24 @@ namespace Server.Scripts.Commands
                 mob.Delete();
             }
             
-            m.SendMessage( 63, "Wipe Complete: All Spawners and wild mobs deleted!" );
+            m.SendMessage( "Wipe Complete: All Spawners and wild mobs deleted!" );
         }
 
         public static void DoDecorate( Mobile m )
         {
-            m.SendMessage( 38, "Generating World Decorations, Signs & Teleporters..." );
+            m.SendMessage( "Generating World Decorations, Signs & Teleporters..." );
             Console.WriteLine( "Decorating the world...");
             
             CommandSystem.Handle(m, String.Format("{0}Decorate", CommandSystem.Prefix));
             CommandSystem.Handle(m, String.Format("{0}SignGen", CommandSystem.Prefix));
             CommandSystem.Handle(m, String.Format("{0}TelGen", CommandSystem.Prefix));
             
-            m.SendMessage( 63, "Decorations, Signs, and Teleporters generated!" );
+            m.SendMessage( "Decorations, Signs, and Teleporters generated!" );
         }
 
         public static void DoSpawns( Mobile m )
         {
-            m.SendMessage( 38, "Parsing map files and generating spawners..." );
+            m.SendMessage( "Parsing map files and generating spawners..." );
 
             Console.WriteLine( "Spawning Overworld...");
             Server.SpawnGenerator.Parse( m, "overworld.map" );
@@ -111,10 +111,13 @@ namespace Server.Scripts.Commands
             Console.WriteLine( "Spawning Dungeon Chests..." );
             Server.SpawnGenerator.Parse( m, "chests.map" );
 
-            Console.WriteLine( "Spawining Dungeon Floor Traps..." );
-            Server.SpawnGenerator.Parse( m, "traps.map" );
+            if ( Server.Settings.S_DungeonTraps )
+            {
+                Console.WriteLine( "Spawining Dungeon Floor Traps..." );
+                Server.SpawnGenerator.Parse( m, "traps.map" );
+            }
 
-            m.SendMessage( 63, "Map parsing complete and world populated!" );
+            m.SendMessage( "Map parsing complete and world populated!" );
         }
     }
 
@@ -181,7 +184,7 @@ namespace Server.Scripts.Commands
                     BuildWorld.DoDecorate( m );
                     BuildWorld.DoSpawns( m );
                     Console.WriteLine( "The world has been built." );
-                    m.SendMessage( 1152, "The world has been completely rebuilt." );
+                    m.SendMessage( "The world has been completely rebuilt." );
                     break;
 
                 case 2: // Wipe Only
diff --git a/Scripts/Settings.cs b/Scripts/Settings.cs
index 7f23a20..aa78a63 100644
--- a/Scripts/Settings.cs
+++ b/Scripts/Settings.cs
@@ -19,5 +19,6 @@ namespace Server
 		public static int S_MaxGold = 1000; // maximum is 10,000
 		public static bool S_CanStealWhileHoldingThings = true;
 		public static bool S_MonstersSurprise = true;
+        public static bool S_DungeonTraps = true;
 	}
 }