diff --git a/parabotv2/src/org/parabot/Landing.java b/parabotv2/src/org/parabot/Landing.java
index 4230f98..7526089 100644
--- a/parabotv2/src/org/parabot/Landing.java
+++ b/parabotv2/src/org/parabot/Landing.java
@@ -22,7 +22,7 @@ public final class Landing {
 			t.printStackTrace();
 		}
 		Directories.validate();
-		Core.enableDevMode();
+		Core.setDebug(true);
 		ServerSelector.getInstance().setVisible(true);
 	}
 
diff --git a/parabotv2/src/org/parabot/core/Core.java b/parabotv2/src/org/parabot/core/Core.java
index 780b6b4..de13b30 100644
--- a/parabotv2/src/org/parabot/core/Core.java
+++ b/parabotv2/src/org/parabot/core/Core.java
@@ -3,25 +3,21 @@ package org.parabot.core;
 /**
  * 
  * @author Clisprail
- *
+ * 
  */
 public class Core {
-	private static boolean devMode = false;
-	
-	/**
-	 * Enables the developers mode
-	 */
-	public static void enableDevMode() {
-		devMode = true;
+
+	private static boolean debug = false;
+
+	public static void setDebug(boolean debug) {
+		Core.debug = debug;
 	}
-	
+
 	/**
-	 * Determines if bot is in developers mode
-	 * @return <b>true</b> if bot is in developers mode
+	 * @return if the botclient is in debug mode.
 	 */
-	public static boolean isDevMode() {
-		return devMode;
+	public static boolean inDebugMode() {
+		return debug;
 	}
-	
 
 }
diff --git a/parabotv2/src/org/parabot/core/parsers/ServerManifestParser.java b/parabotv2/src/org/parabot/core/parsers/ServerManifestParser.java
index 8ddf905..fd59cb3 100644
--- a/parabotv2/src/org/parabot/core/parsers/ServerManifestParser.java
+++ b/parabotv2/src/org/parabot/core/parsers/ServerManifestParser.java
@@ -20,20 +20,21 @@ import org.parabot.environment.servers.loader.ServerLoader;
 /**
  * 
  * @author Clisprail
- *
+ * 
  */
 public class ServerManifestParser {
 	public static Map<ServerDescription, ServerCache> cache = new HashMap<ServerDescription, ServerCache>();
-	
+
 	/**
 	 * Gets server descriptions
+	 * 
 	 * @return list of descriptions
 	 */
 	public ServerDescription[] getDescriptions() {
-		if(Core.isDevMode()) {
+		if (Core.inDebugMode()) {
 			return localDesc();
 		}
-		return publicDesc(); 
+		return publicDesc();
 	}
 
 	private ServerDescription[] publicDesc() {
@@ -47,17 +48,17 @@ public class ServerManifestParser {
 			Method method = URLClassLoader.class.getDeclaredMethod("addURL", URL.class);
 			method.setAccessible(true);
 			method.invoke((URLClassLoader) ClassLoader.getSystemClassLoader(), Directories.getServerPath().toURI().toURL());
-		} catch(Exception e) {
+		} catch (Exception e) {
 			e.printStackTrace();
 		}
 		final ServerLoader loader = new ServerLoader(path);
 		final List<ServerProvider> providers = new ArrayList<ServerProvider>();
 		final List<ServerDescription> descs = new ArrayList<ServerDescription>();
-		for(final String className : loader.getServerClassNames()) {
+		for (final String className : loader.getServerClassNames()) {
 			try {
 				final Class<?> serverProviderClass = loader.loadClass(className);
 				final Object annotation = serverProviderClass.getAnnotation(ServerManifest.class);
-				if(annotation == null) {
+				if (annotation == null) {
 					throw new RuntimeException("Missing manifest at " + className);
 				}
 				final ServerManifest manifest = (ServerManifest) annotation;
@@ -69,29 +70,29 @@ public class ServerManifestParser {
 				t.printStackTrace();
 			}
 		}
-		if(providers.isEmpty()) {
+		if (providers.isEmpty()) {
 			return null;
 		}
 		final ServerCache cachedServer = new ServerCache(loader, providers.toArray(new ServerProvider[providers.size()]));
-		for(final ServerDescription desc : descs) {
+		for (final ServerDescription desc : descs) {
 			cache.put(desc, cachedServer);
 		}
 		return descs.toArray(new ServerDescription[descs.size()]);
 	}
-	
+
 	public class ServerCache {
 		private ServerLoader serverLoader = null;
 		private ServerProvider[] serverProviders = null;
-			
+
 		private ServerCache(final ServerLoader serverLoader, final ServerProvider[] serverProviders) {
 			this.serverLoader = serverLoader;
 			this.serverProviders = serverProviders;
 		}
-		
+
 		public ServerLoader getLoader() {
 			return serverLoader;
 		}
-		
+
 		public ServerProvider[] getProviders() {
 			return serverProviders;
 		}
diff --git a/parabotv2/src/org/parabot/core/ui/components/LogArea.java b/parabotv2/src/org/parabot/core/ui/components/LogArea.java
index 42822ba..0305350 100644
--- a/parabotv2/src/org/parabot/core/ui/components/LogArea.java
+++ b/parabotv2/src/org/parabot/core/ui/components/LogArea.java
@@ -16,6 +16,7 @@ import org.parabot.core.logging.SystemConsoleHandler;
 import org.parabot.core.logging.TextAreaLogHandler;
 
 public class LogArea extends JScrollPane {
+
 	private static final long serialVersionUID = 6571141103751675714L;
 	private static LogArea instance = null;
 	private static LogTextArea logArea = new LogTextArea();
diff --git a/parabotv2/src/org/parabot/environment/Environment.java b/parabotv2/src/org/parabot/environment/Environment.java
index dafb980..eaaf8de 100644
--- a/parabotv2/src/org/parabot/environment/Environment.java
+++ b/parabotv2/src/org/parabot/environment/Environment.java
@@ -1,6 +1,7 @@
 package org.parabot.environment;
 
 import java.lang.reflect.Constructor;
+
 import org.parabot.core.Context;
 import org.parabot.core.Core;
 import org.parabot.core.classpath.ClassPath;
@@ -16,26 +17,27 @@ import org.parabot.environment.servers.loader.ServerLoader;
 /**
  * 
  * @author Clisprail
- *
+ * 
  */
 public class Environment {
-	
+
 	/**
 	 * Loads a new environment
+	 * 
 	 * @param url
 	 */
 	public static void load(final ServerDescription desc, final String serverName) {
 		ServerSelector.getInstance().dispose();
-		if(!BotUI.getInstance().isVisible()) {
+		if (!BotUI.getInstance().isVisible()) {
 			BotUI.getInstance().setVisible(true);
 		}
-		
-		final ClassPath classPath = Core.isDevMode() ? null : new ClassPath();
-		final ServerCache cache = Core.isDevMode() ? ServerManifestParser.cache.get(desc) : null;
-		
-		final ServerLoader serverLoader = Core.isDevMode() ? cache.getLoader() : new ServerLoader(classPath);
+
+		final ClassPath classPath = Core.inDebugMode() ? null : new ClassPath();
+		final ServerCache cache = Core.inDebugMode() ? ServerManifestParser.cache.get(desc) : null;
+
+		final ServerLoader serverLoader = Core.inDebugMode() ? cache.getLoader() : new ServerLoader(classPath);
 		String[] serverProviders = null;
-		if(!Core.isDevMode()) {
+		if (!Core.inDebugMode()) {
 			serverProviders = serverLoader.getServerClassNames();
 			if (serverProviders == null) {
 				throw new RuntimeException("No server provided.");
@@ -47,7 +49,7 @@ public class Environment {
 			@Override
 			public void run() {
 				try {
-					final ServerProvider server = !Core.isDevMode() ? fetchServerProvider(serverLoader) : cache.getProviders()[desc.providerIndex];
+					final ServerProvider server = !Core.inDebugMode() ? fetchServerProvider(serverLoader) : cache.getProviders()[desc.providerIndex];
 					final Context context = new Context(server);
 					context.setEnvironment(serverLoader);
 					BotToolbar.getInstance().addTab(context, serverName);
@@ -58,7 +60,7 @@ public class Environment {
 			}
 		}).start();
 	}
-	
+
 	private static ServerProvider fetchServerProvider(ServerLoader loader) {
 		try {
 			final String[] serverProviders = loader.getServerClassNames();