diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index d68d3fe..815e8b2 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -84,7 +84,6 @@
 import org.ultramine.server.BackupManager;
 import org.ultramine.server.ConfigurationHandler;
 import org.ultramine.server.internal.WatchdogThread;
-import org.ultramine.server.bootstrap.UMBootstrap;
 import org.ultramine.server.internal.ChatComponentLogMessage;
 import org.ultramine.server.world.MultiWorld;
 
@@ -401,7 +400,7 @@
 			if (normalStarted = startServer())
 			{
 				FMLCommonHandler.instance().handleServerStarted();
-				logger.info((UMBootstrap.isColoredTerminal() ? "\u00a7e" : "") + "Server loading totally finished");
+				logger.info("\u00a7eServer loading totally finished");
 				long i = getSystemTimeMillis();
 				long l = 0L;
 				this.field_147147_p.func_151315_a(new ChatComponentText(this.motd));
@@ -411,7 +410,7 @@
 				if(!isSinglePlayer()) WatchdogThread.doStart();
 				
 				long curWait = 0L;
-				long curPickWait = 0L;
+				long curPeakWait = 0L;
 				for (long lastTick = System.nanoTime() - TICK_TIME; this.serverRunning; this.serverIsRunning = true)
 				{
 					long curTime = System.nanoTime();
@@ -432,12 +431,12 @@
 
 					currentTPS = (currentTPS * 0.95) + (1E9 / (curTime - lastTick) * 0.05);
 					currentWait = (long)(currentWait * 0.95 + curWait * 0.05);
-					if(curWait < curPickWait)
-						curPickWait = curWait;
+					if(curWait < curPeakWait)
+						curPeakWait = curWait;
 					if(tickCounter % 20 == 0)
 					{
-						pickWait = curPickWait;
-						curPickWait = TICK_TIME;
+						peakWait = curPeakWait;
+						curPeakWait = TICK_TIME;
 					}
 					curWait = 0;
 					
@@ -1502,7 +1501,7 @@
 	public double currentTPS = 20;
 	private long catchupTime = 0;
 	public long currentWait = TICK_TIME;
-	public long pickWait = TICK_TIME;
+	public long peakWait = TICK_TIME;
 	public final long startTime = System.currentTimeMillis();
 	private Thread serverThread;
 	private final MultiWorld multiworld = new MultiWorld(this);
diff --git a/src/main/java/org/ultramine/commands/basic/TechCommands.java b/src/main/java/org/ultramine/commands/basic/TechCommands.java
index 14782ab..4cbabea 100644
--- a/src/main/java/org/ultramine/commands/basic/TechCommands.java
+++ b/src/main/java/org/ultramine/commands/basic/TechCommands.java
@@ -89,14 +89,14 @@
 	{
 		double tps = Math.round(ctx.getServer().currentTPS*10)/10d;
 		double downtime = ctx.getServer().currentWait/1000/1000d;
-		double pickdowntime = ctx.getServer().pickWait/1000/1000d;
+		double peakdowntime = ctx.getServer().peakWait /1000/1000d;
 		int load = (int)Math.round((50-downtime)/50*100);
-		int pickload = (int)Math.round((50-pickdowntime)/50*100);
+		int peakload = (int)Math.round((50-peakdowntime)/50*100);
 		int uptime = (int)((System.currentTimeMillis() - ctx.getServer().startTime)/1000);
-		ChatComponentText pickloadcomp = new ChatComponentText(Integer.toString(pickload).concat("%"));
-		pickloadcomp.getChatStyle().setColor(pickload >= 200 ? RED : DARK_GREEN);
+		ChatComponentText peakloadcomp = new ChatComponentText(Integer.toString(peakload).concat("%"));
+		peakloadcomp.getChatStyle().setColor(peakload >= 200 ? RED : DARK_GREEN);
 		ctx.sendMessage(DARK_GREEN, "command.uptime.msg.up", String.format("%dd %dh %dm %ds", uptime/(60*60*24), uptime/(60*60)%24, uptime/60%60, uptime%60));
-		ctx.sendMessage(load > 100 ? RED : DARK_GREEN, "command.uptime.msg.load", Integer.toString(load).concat("%"), pickloadcomp);
+		ctx.sendMessage(load > 100 ? RED : DARK_GREEN, "command.uptime.msg.load", Integer.toString(load).concat("%"), peakloadcomp);
 		ctx.sendMessage(tps < 15 ? RED : DARK_GREEN, "command.uptime.msg.tps",  tps, Integer.toString((int)(tps/20*100)).concat("%"));
 	}
 	
diff --git a/src/main/java/org/ultramine/server/internal/UMEventHandler.java b/src/main/java/org/ultramine/server/internal/UMEventHandler.java
index 38bdc07..a4abfef 100644
--- a/src/main/java/org/ultramine/server/internal/UMEventHandler.java
+++ b/src/main/java/org/ultramine/server/internal/UMEventHandler.java
@@ -26,7 +26,6 @@
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.ChatComponentStyle;
@@ -37,7 +36,7 @@
 import net.minecraft.util.IChatComponent;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.ChunkPosition;
-import net.minecraft.world.WorldServer;
+
 import static net.minecraft.util.EnumChatFormatting.*;
 
 import net.minecraftforge.common.ForgeHooks;
@@ -151,17 +150,17 @@
 			{
 				double tps = Math.round(server.currentTPS*10)/10d;
 				double downtime = server.currentWait/1000/1000d;
-				double pickdowntime = server.pickWait/1000/1000d;
+				double peakdowntime = server.peakWait /1000/1000d;
 				int load = (int)Math.round((50-downtime)/50*100);
-				int pickload = (int)Math.round((50-pickdowntime)/50*100);
+				int peakload = (int)Math.round((50-peakdowntime)/50*100);
 				ChatComponentText loadcomp = new ChatComponentText(Integer.toString(load).concat("%"));
-				ChatComponentText pickloadcomp = new ChatComponentText(Integer.toString(pickload).concat("%"));
+				ChatComponentText peakloadcomp = new ChatComponentText(Integer.toString(peakload).concat("%"));
 				ChatComponentText tpscomp = new ChatComponentText(Double.toString(tps));
 				loadcomp.getChatStyle().setColor(load > 100 ? RED : DARK_GREEN);
-				pickloadcomp.getChatStyle().setColor(pickload >= 200 ? RED : DARK_GREEN);
+				peakloadcomp.getChatStyle().setColor(peakload >= 200 ? RED : DARK_GREEN);
 				tpscomp.getChatStyle().setColor(tps < 15 ? RED : DARK_GREEN);
 
-				ChatComponentTranslation full = new ChatComponentTranslation("ultramine.autobroadcast.debugmsg", loadcomp, pickloadcomp, tpscomp,
+				ChatComponentTranslation full = new ChatComponentTranslation("ultramine.autobroadcast.debugmsg", loadcomp, peakloadcomp, tpscomp,
 						server.getConfigurationManager().playerEntityList.size());
 				full.getChatStyle().setColor(YELLOW);