diff --git a/Client/src/main/java/de/com/baseband/client/feature/commands/Bind.java b/Client/src/main/java/de/com/baseband/client/feature/commands/Bind.java
index d217306..c0fbbac 100644
--- a/Client/src/main/java/de/com/baseband/client/feature/commands/Bind.java
+++ b/Client/src/main/java/de/com/baseband/client/feature/commands/Bind.java
@@ -7,8 +7,10 @@ import de.com.baseband.client.feature.modules.client.Client;
 import de.com.baseband.client.registry.SetCommand;
 import de.com.baseband.client.util.interact.Chat;
 import org.lwjgl.input.Keyboard;
+import de.com.baseband.client.registry.annotation.Description;
 
 @Command
+@Description("Sets a keybind")
 public class Bind extends Feature {
     @Override
     public void onCommand(String[] args) {
diff --git a/Client/src/main/java/de/com/baseband/client/feature/commands/Connect.java b/Client/src/main/java/de/com/baseband/client/feature/commands/Connect.java
index bed336d..d8e38e8 100644
--- a/Client/src/main/java/de/com/baseband/client/feature/commands/Connect.java
+++ b/Client/src/main/java/de/com/baseband/client/feature/commands/Connect.java
@@ -4,10 +4,12 @@ import de.com.baseband.client.feature.Feature;
 import de.com.baseband.client.feature.category.Command;
 import de.com.baseband.prod.LoadHandler;
 import net.minecraftforge.fml.client.FMLClientHandler;
+import de.com.baseband.client.registry.annotation.Description;
 
 import static de.com.baseband.client.BaseBand.LOGGER;
 
 @Command
+@Description("Connects to a server")
 public class Connect extends Feature {
     @Override
     public String toString() {
diff --git a/Client/src/main/java/de/com/baseband/client/feature/commands/Credit.java b/Client/src/main/java/de/com/baseband/client/feature/commands/Credit.java
index 805030f..70a1b6e 100644
--- a/Client/src/main/java/de/com/baseband/client/feature/commands/Credit.java
+++ b/Client/src/main/java/de/com/baseband/client/feature/commands/Credit.java
@@ -3,8 +3,10 @@ package de.com.baseband.client.feature.commands;
 import de.com.baseband.client.feature.Feature;
 import de.com.baseband.client.feature.category.Command;
 import de.com.baseband.client.util.interact.Chat;
+import de.com.baseband.client.registry.annotation.Description;
 
 @Command
+@Description("Shows the credits for BaseBand")
 public class Credit extends Feature {
 
     @Override
@@ -14,9 +16,14 @@ public class Credit extends Feature {
 
     @Override
     public void onCommand(String[] args) {
-        Chat.print("Credits:");
-        Chat.print("Jess H - Insanity.");
-        Chat.print("TudbuT - Client Base, Settings System, Loader.");
-        Chat.print("John200410 - Telling me to increase the BCrypt rounds.");
+        Chat.print("§lCredits:");
+        Chat.print("");
+        Chat.print("Project started by §dJess§r, adopted by §aTudbuT§r.");
+        Chat.print("");
+        Chat.print("§aTudbuT§r - Client base, settings system / registry, loader, most modules");
+        Chat.print("§dJess H§r - Help during early loader development, some modules, original server");
+        Chat.print("§bJohn200410§r - Giving some advice");
+        Chat.print("");
+        Chat.print("Thanks for playing! <3");
     }
 }
diff --git a/Client/src/main/java/de/com/baseband/client/feature/commands/Disconnect.java b/Client/src/main/java/de/com/baseband/client/feature/commands/Disconnect.java
index a9804a9..e8dd27d 100644
--- a/Client/src/main/java/de/com/baseband/client/feature/commands/Disconnect.java
+++ b/Client/src/main/java/de/com/baseband/client/feature/commands/Disconnect.java
@@ -4,8 +4,10 @@ import de.com.baseband.client.feature.Feature;
 import de.com.baseband.client.feature.category.Command;
 import net.minecraft.network.play.server.SPacketDisconnect;
 import net.minecraft.util.text.TextComponentString;
+import de.com.baseband.client.registry.annotation.Description;
 
 @Command
+@Description("Disconnects from the current server.")
 public class Disconnect extends Feature {
 
     @Override
diff --git a/Client/src/main/java/de/com/baseband/client/feature/commands/Help.java b/Client/src/main/java/de/com/baseband/client/feature/commands/Help.java
index 03ce2b9..dc2ce91 100644
--- a/Client/src/main/java/de/com/baseband/client/feature/commands/Help.java
+++ b/Client/src/main/java/de/com/baseband/client/feature/commands/Help.java
@@ -9,8 +9,10 @@ import de.com.baseband.client.util.interact.Chat;
 import de.tudbut.obj.TLMap;
 import net.minecraft.util.text.Style;
 import net.minecraft.util.text.TextComponentString;
+import de.com.baseband.client.registry.annotation.Description;
 
 @Command
+@Description("Access the BaseBand Help system")
 public class Help extends Feature {
 
     String type;
diff --git a/Client/src/main/java/de/com/baseband/client/feature/commands/Say.java b/Client/src/main/java/de/com/baseband/client/feature/commands/Say.java
index ddd06ce..543c63e 100644
--- a/Client/src/main/java/de/com/baseband/client/feature/commands/Say.java
+++ b/Client/src/main/java/de/com/baseband/client/feature/commands/Say.java
@@ -3,8 +3,10 @@ package de.com.baseband.client.feature.commands;
 import de.com.baseband.client.feature.Feature;
 import de.com.baseband.client.feature.category.Command;
 import net.minecraft.network.play.client.CPacketChatMessage;
+import de.com.baseband.client.registry.annotation.Description;
 
 @Command
+@Description("Says something in chat, even if it contains a command prefix.")
 public class Say extends Feature {
 
     @Override
diff --git a/Client/src/main/java/de/com/baseband/client/feature/commands/Set.java b/Client/src/main/java/de/com/baseband/client/feature/commands/Set.java
index 509c256..da88227 100644
--- a/Client/src/main/java/de/com/baseband/client/feature/commands/Set.java
+++ b/Client/src/main/java/de/com/baseband/client/feature/commands/Set.java
@@ -8,10 +8,12 @@ import de.com.baseband.client.feature.modules.client.Client;
 import de.com.baseband.client.registry.ConfigHandle;
 import de.com.baseband.client.registry.SetCommand;
 import de.com.baseband.client.util.interact.Chat;
+import de.com.baseband.client.registry.annotation.Description;
 
 import java.util.HashMap;
 
 @Command
+@Description("Changes a setting of some module")
 public class Set extends Feature {
 
     private static final HashMap<Integer, ConfigHandle> quickSet = new HashMap<>();
diff --git a/Client/src/main/java/de/com/baseband/client/feature/commands/Toggle.java b/Client/src/main/java/de/com/baseband/client/feature/commands/Toggle.java
index c0e9ef0..d791d97 100644
--- a/Client/src/main/java/de/com/baseband/client/feature/commands/Toggle.java
+++ b/Client/src/main/java/de/com/baseband/client/feature/commands/Toggle.java
@@ -5,8 +5,10 @@ import de.com.baseband.client.feature.Features;
 import de.com.baseband.client.feature.category.Command;
 import de.com.baseband.client.feature.modules.client.Client;
 import de.com.baseband.client.util.interact.Chat;
+import de.com.baseband.client.registry.annotation.Description;
 
 @Command
+@Description("Toggles a module")
 public class Toggle extends Feature {
 
     @Override