diff --git a/Block.cs b/Block.cs
index 678181da3..fb1d1e5ae 100644
--- a/Block.cs
+++ b/Block.cs
@@ -1966,7 +1966,7 @@ namespace MCGalaxy
                 case fishlavashark: return obsidian;
 
                 default:
-                    if (b < 50) return b; else return 22;
+                    if (b < 66) return b; else return 22;
             }
         }
         public static byte SaveConvert(byte b)
diff --git a/Commands/CmdGoto.cs b/Commands/CmdGoto.cs
index bca5a3ef0..211f5c90d 100644
--- a/Commands/CmdGoto.cs
+++ b/Commands/CmdGoto.cs
@@ -136,7 +136,10 @@ namespace MCGalaxy.Commands
                 else if (Server.AutoLoad)
                 {
                     if (!File.Exists("levels/" + message + ".lvl"))
-                        Player.SendMessage(p, "Level \"" + message + "\" doesn't exist!");
+                    {
+                        Player.SendMessage(p, "Level \"" + message + "\" doesn't exist! Did you mean...");
+                        Command.all.Find("search").Use(p, "levels " + message);
+                    }
                     else if (Level.Find(message) != null || Level.CheckLoadOnGoto(message))
                     {
                         Command.all.Find("load").Use(p, message);
@@ -146,7 +149,11 @@ namespace MCGalaxy.Commands
                     else
                         Player.SendMessage(p, "Level \"" + message + "\" cannot be loaded using /goto!");
                 }
-                else Player.SendMessage(p, "There is no level \"" + message + "\" loaded.");
+                else 
+                { 
+                    Player.SendMessage(p, "There is no level \"" + message + "\" loaded. Did you mean..");
+                    Command.all.Find("search").Use(p, "levels " + message);
+                }
 
                 GC.Collect();
                 GC.WaitForPendingFinalizers();
diff --git a/Commands/CmdOverseer.cs b/Commands/CmdOverseer.cs
index 3b144e3b6..c662ffcf3 100644
--- a/Commands/CmdOverseer.cs
+++ b/Commands/CmdOverseer.cs
@@ -99,9 +99,9 @@ namespace MCGalaxy.Commands
 			{
 				if (par == "ADD")
 				{
-					if ((File.Exists(@"levels\" + p.name.ToLower() + ".lvl")) || (File.Exists(@"levels\" + p.name.ToLower() + "00.lvl")))
+					if ((File.Exists("levels/" + p.name.ToLower() + ".lvl")) || (File.Exists("levels/" + p.name.ToLower() + "00.lvl")))
 					{
-                        foreach(string filenames in Directory.GetFiles(@"levels\"))
+                        foreach(string filenames in Directory.GetFiles("levels"))
                         {
                             for(int i = 1; i < p.group.OverseerMaps + 2; i++)
                             {
@@ -110,7 +110,7 @@ namespace MCGalaxy.Commands
                                     i = 2;
                                 if(i != 0)
                                 {
-                                if(!File.Exists(@"levels\" + p.name.ToLower() + i + ".lvl"))
+                                if(!File.Exists("levels/" + p.name.ToLower() + i + ".lvl"))
                                 {
                                     if(i > p.group.OverseerMaps)
                                     {
diff --git a/Commands/CmdWhois.cs b/Commands/CmdWhois.cs
index 468c0807a..18192f5e6 100644
--- a/Commands/CmdWhois.cs
+++ b/Commands/CmdWhois.cs
@@ -33,7 +33,7 @@ namespace MCGalaxy.Commands
             if (message == "") { who = p; message = p.name; } else { who = Player.Find(message); }
             if (who != null && !who.hidden)
             {
-                Player.SendMessage(p, who.color + who.name + Server.DefaultColor + " is on &b" + who.level.name);
+                Player.SendMessage(p, who.color + who.name + " (" + p.DisplayName + ") " + Server.DefaultColor + " is on &b" + who.level.name);
                 Player.SendMessage(p, who.color + who.prefix + who.name + Server.DefaultColor + " has :");
                 Player.SendMessage(p, "> > the rank of " + who.group.color + who.group.name);
                 try
diff --git a/MCGalaxy.userprefs b/MCGalaxy.userprefs
index 15108092d..8217dfc4a 100644
--- a/MCGalaxy.userprefs
+++ b/MCGalaxy.userprefs
@@ -1,11 +1,10 @@
 <Properties>
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|x86" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="Player/Player.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="Commands/CmdOverseer.cs">
     <Files>
       <File FileName="Commands/CmdCuboid.cs" Line="439" Column="40" />
       <File FileName="Commands/Command.cs" Line="120" Column="30" />
-      <File FileName="Player/Player.cs" Line="2076" Column="18" />
-      <File FileName="Server.cs" Line="167" Column="40" />
+      <File FileName="Player/Player.cs" Line="2745" Column="38" />
       <File FileName="Commands/CmdAbort.cs" Line="1" Column="1" />
       <File FileName="Commands/CmdCopy.cs" Line="1" Column="1" />
       <File FileName="Commands/CmdFill.cs" Line="1" Column="1" />
@@ -24,15 +23,20 @@
       <File FileName="Commands/CmdJail.cs" Line="66" Column="31" />
       <File FileName="Commands/CmdPromote.cs" Line="1" Column="1" />
       <File FileName="Commands/CmdSetRank.cs" Line="173" Column="1" />
+      <File FileName="Color.cs" Line="86" Column="28" />
+      <File FileName="ForgeBot.cs" Line="94" Column="42" />
+      <File FileName="Commands/CmdWhois.cs" Line="36" Column="92" />
+      <File FileName="Commands/CmdGoto.cs" Line="140" Column="104" />
+      <File FileName="Commands/CmdOverseer.cs" Line="163" Column="7" />
     </Files>
     <Pads>
       <Pad Id="ProjectPad">
         <State expanded="True">
           <Node name="MCGalaxy_" expanded="True">
-            <Node name="Commands" expanded="True" />
-            <Node name="Player" expanded="True">
-              <Node name="Player.cs" selected="True" />
+            <Node name="Commands" expanded="True">
+              <Node name="CmdOverseer.cs" selected="True" />
             </Node>
+            <Node name="Player" expanded="True" />
           </Node>
         </State>
       </Pad>
diff --git a/Player/Player.cs b/Player/Player.cs
index f0b3ee640..1762aeebd 100644
--- a/Player/Player.cs
+++ b/Player/Player.cs
@@ -2742,6 +2742,7 @@ return;
             StringBuilder sb = new StringBuilder(message);
 
             if ( colorParse ) {
+                sb.Replace("%r", "&f");
                 for ( int i = 0; i < 10; i++ ) {
                     sb.Replace("%" + i, "&" + i);
                     sb.Replace("&" + i + " &", " &");