diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/draw/Draw.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/draw/Draw.java
index dc329bec5..8c04196ab 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/draw/Draw.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/draw/Draw.java
@@ -113,7 +113,12 @@ public class Draw extends SoloGame
 				"Book", "Swimming", "Horse", "Paper", "Toaster", "Television", "Hammer", "Piano", "Sleeping", "Yawn", "Sheep", "Night", "Chest", "Lamp", "Redstone", 
 				"Grass", "Plane", "Ocean", "Lake", "Melon", "Pumpkin", "Gift", "Fishing", "Pirate", "Lightning", "Stomach", "Belly Button", "Fishing Rod", 
 				"Iron Ore", "Diamonds", "Emeralds", "Nether Portal", "Ender Dragon", "Rabbit", "Harry Potter", "Miley Cyrus", "Torch", "Light", "Battery",
-				"Zombie Pigman", "Telephone", "Tent"
+				"Zombie Pigman", "Telephone", "Tent", "Hand",
+				"Spoon", "Rainbow", "Staircase", "Poop", "Dragon", "Fire", "Apple", "Shoe", "Squid", "Cookie", "Tooth", "Camera", "Sock", "Monkey", 
+				"Unicorn", "Smile", "Pool", "Rabbit", "Cupcake", "Pancake", "Princess", "Castle", "Flag", "Planet", "Stars", "Camp Fire", "Rose", 
+				"Spray", "Pencil", "Torch", "Ice Cream", "Toilet", "Moose", "Bear", "Beer", "Batman", "Sun Glasses", 
+				"Golf Club", "Tennis Racket", "Shield", "Crab", "Pot of Gold", "Cactus", "Television", "Pumpkin Pie", "Chimney", "Stable", "Nether", "Wither", 
+				"Beach", "Stop Sign", "Chestplate", "Pokeball", "Christmas Tree", "Present", "Snowflake", "Laptop", "Superman", "Football", "Basketball", "Creeper", "Tetris", "Jump", "Ninja", "Baby", "Troll Face", "Grim Reaper", "Temple", 
 				};
 	}
 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java
index a75711637..e765e1b30 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java
@@ -9,6 +9,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Chunk;
 import org.bukkit.Difficulty;
+import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Sound;
@@ -969,6 +970,20 @@ public class UHC extends TeamGame
 
 			Announce(event.getPlayer().getName() + " set time to Day and Night!");
 		}
+		
+		if (event.getMessage().startsWith("/dragondamage"))
+		{
+			if (event.getPlayer().getName().equals("Chiss"))
+			{
+				for (Entity ent : event.getPlayer().getWorld().getEntities())
+				{
+					if (ent instanceof EnderDragon)
+					{
+						((EnderDragon) ent).damage(100, event.getPlayer());
+					}
+				}
+			}
+		}
 	}
 
 	@EventHandler
@@ -1331,7 +1346,7 @@ public class UHC extends TeamGame
 		if (!_ended)
 			return;
 		
-		GameTeam endTeam = GetTeam("Post Game", false);
+		GameTeam endTeam = GetTeam(ChatColor.GRAY);
 		
 		if (endTeam == null)
 		{
@@ -1347,10 +1362,29 @@ public class UHC extends TeamGame
 			{
 				team.RemovePlayer(player);
 				Manager.Clear(player);
-			}
-			
-			endTeam.AddPlayer(player);
-			player.setGameMode(GameMode.CREATIVE);
+				
+				endTeam.AddPlayer(player);
+				player.setGameMode(GameMode.CREATIVE);
+				player.setFlying(true);
+			}	
+		}
+	}
+	
+	@EventHandler
+	public void EndCommands(PlayerCommandPreprocessEvent event)
+	{
+		if (!IsLive())
+			return;
+		
+		if (!_ended)
+			return;
+
+		if (event.getMessage().startsWith("/world"))
+		{
+			event.setCancelled(true);
+			event.getPlayer().teleport(_portalBlock.get(0).clone().add(0, 10, 0));
+			event.getPlayer().setGameMode(GameMode.CREATIVE);
+			event.getPlayer().setFlying(true);
 		}
 	}
 }
\ No newline at end of file