diff --git a/src/Main.java b/src/Main.java
index 9645390..1dd809b 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -24,13 +24,13 @@ class Main {
 			try {
 				setup();
 				new GUI();
-				new ServerConsoles();
+				//new ServerConsoles();
 				Profile.addProfile("Default");
 				//TODO: replace with profiles loading generating a default profile if empty.
 
 				ScheduledExecutorService exec = Executors.newSingleThreadScheduledExecutor();
 				exec.scheduleAtFixedRate(() -> {
-                    //TODO: Read from consoles and insert into gui not added yet.
+                    //TODO: Read from consoles and insert into ServerConsoles.
                 }, 0, 5, TimeUnit.SECONDS);
 			} catch (Exception e) {
 				e.printStackTrace();
diff --git a/src/net/knarcraft/serverlauncher/server/ServerType.java b/src/net/knarcraft/serverlauncher/server/ServerType.java
index bafbdec..6d85310 100644
--- a/src/net/knarcraft/serverlauncher/server/ServerType.java
+++ b/src/net/knarcraft/serverlauncher/server/ServerType.java
@@ -42,7 +42,7 @@ public class ServerType {
 		return serverTypes;
 	}
 
-	public static String[] getTypeNames(){
+	public static String[] getTypeNames() {
 		ArrayList<ServerType> types = ServerType.getServerTypes();
 		String[] serverTypes = new String[types.size()];
 		for (int i = 0; i <  types.size(); i++) {
diff --git a/src/net/knarcraft/serverlauncher/userinterface/Console.java b/src/net/knarcraft/serverlauncher/userinterface/Console.java
index 295fe96..cc11b96 100644
--- a/src/net/knarcraft/serverlauncher/userinterface/Console.java
+++ b/src/net/knarcraft/serverlauncher/userinterface/Console.java
@@ -3,6 +3,14 @@ package net.knarcraft.serverlauncher.userinterface;
 import javax.swing.*;
 import java.awt.*;
 
+/**
+ * Acts as a single writable/readable tab
+ * Has a box for user input, and a textArea for server output.
+ *
+ * @author      Kristian Knarvik <kristian.knarvik@knett.no>
+ * @version     0.0.0.1
+ * @since       0.0.0.1
+ */
 class Console {
     private JTextField textInput;
     private JTextArea textOutput;
diff --git a/src/net/knarcraft/serverlauncher/userinterface/ServerConsoles.java b/src/net/knarcraft/serverlauncher/userinterface/ServerConsoles.java
index 7d9b857..799ad3e 100644
--- a/src/net/knarcraft/serverlauncher/userinterface/ServerConsoles.java
+++ b/src/net/knarcraft/serverlauncher/userinterface/ServerConsoles.java
@@ -3,10 +3,20 @@ package net.knarcraft.serverlauncher.userinterface;
 import javax.swing.JFrame;
 import javax.swing.JTabbedPane;
 import java.awt.BorderLayout;
+import java.util.ArrayList;
 
+/**
+ * A parent window for server consoles
+ * Should be toggled with the "View server consoles" button
+ * Keeps track of all consoles
+ *
+ * @author      Kristian Knarvik <kristian.knarvik@knett.no>
+ * @version     0.0.0.1
+ * @since       0.0.0.1
+ */
 public class ServerConsoles {
-
     private static ServerConsoles serverConsoles;
+    private static ArrayList<Console> consoles = new ArrayList<>();
     private JFrame frame;
     private JTabbedPane consolesTab;
 
diff --git a/src/net/knarcraft/serverlauncher/userinterface/ServerTab.java b/src/net/knarcraft/serverlauncher/userinterface/ServerTab.java
index bce77ce..6adf52d 100644
--- a/src/net/knarcraft/serverlauncher/userinterface/ServerTab.java
+++ b/src/net/knarcraft/serverlauncher/userinterface/ServerTab.java
@@ -7,13 +7,18 @@ import javax.swing.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
+/**
+ * Contains all buttons for configuring a server
+ * Does some visual stuff by itself, but otherwise reads boxes and stuff
+ *
+ * @author      Kristian Knarvik <kristian.knarvik@knett.no>
+ * @version     0.0.0.1
+ * @since       0.0.0.1
+ */
 public class ServerTab implements ActionListener {
-    private final JComboBox<String> serverTypes;
-    private final JComboBox<String> serverVersions;
-    private final JComboBox<String> maxRam;
+    private final JComboBox<String> serverTypes, serverVersions, maxRam;
     private final JCheckBox chckbxEnabled;
-    private final JButton btnRemoveServer;
-    private final JButton btnBrowse;
+    private final JButton btnRemoveServer, btnBrowse;
     private final JTextField directory;
 
     public ServerTab(String name) {