diff --git a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/CoreCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/CoreCommand.java
index 18a86b28..f084b35f 100644
--- a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/CoreCommand.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/CoreCommand.java
@@ -2,6 +2,7 @@
 
 import io.github.niestrat99.advancedteleport.config.CustomMessages;
 import io.github.niestrat99.advancedteleport.managers.CommandManager;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -37,11 +38,15 @@ public boolean onCommand(
             help.onCommand(sender, cmd, s, args);
             return true;
         }
-        if (sender.hasPermission("at.member.core." + command)
-                || sender.hasPermission("at.admin.core." + command)) {
-            CommandManager.subcommands
+        if (sender.hasPermission("at.member.core." + command) || sender.hasPermission("at.admin.core." + command)) {
+            boolean correctUse = CommandManager.subcommands
                     .get(command)
                     .onCommand(sender, cmd, s, Arrays.copyOfRange(args, 1, args.length));
+
+            if (!correctUse) {
+                CustomMessages.sendMessage(sender, "Error.commandUse",
+                        Placeholder.component("usage", CustomMessages.getComponent("Usages.Subcommands." + command)));
+            }
         } else {
             CustomMessages.sendMessage(sender, "Error.noPermission");
         }
diff --git a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/ClearCacheCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/ClearCacheCommand.java
index 9dc5cf02..f4e0fe63 100644
--- a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/ClearCacheCommand.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/ClearCacheCommand.java
@@ -67,7 +67,7 @@ public boolean onCommand(
                         CoreClass.getInstance(), () -> RTPManager.loadWorldData(world));
         CustomMessages.sendMessage(
                 sender, "Info.clearWorld", Placeholder.unparsed("world", args[0]));
-        return false;
+        return true;
     }
 
     @Override
diff --git a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/ExportCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/ExportCommand.java
index f115d657..e0ec9fb0 100644
--- a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/ExportCommand.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/ExportCommand.java
@@ -29,7 +29,7 @@ public boolean onCommand(
         // If there's no arguments contained, stop there
         if (args.length == 0) {
             CustomMessages.sendMessage(sender, "Error.noPluginSpecified");
-            return true;
+            return false;
         }
 
         // Attempt to get the plugin
diff --git a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/ImportCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/ImportCommand.java
index 0c91e2b2..f735f575 100644
--- a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/ImportCommand.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/ImportCommand.java
@@ -48,7 +48,7 @@ public boolean onCommand(
             @NotNull final String[] args) {
         if (args.length == 0) {
             CustomMessages.sendMessage(sender, "Error.noPluginSpecified");
-            return true;
+            return false;
         }
 
         final var pluginHook = getImportExportPlugin(sender, args);
diff --git a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/MapCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/MapCommand.java
index 0b829702..0d700119 100644
--- a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/MapCommand.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/MapCommand.java
@@ -2,6 +2,8 @@
 
 import io.github.niestrat99.advancedteleport.commands.SubATCommand;
 import io.github.niestrat99.advancedteleport.commands.core.map.*;
+import io.github.niestrat99.advancedteleport.config.CustomMessages;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
@@ -43,24 +45,30 @@ public boolean onCommand(
         // If there's no arguments, stop there
         if (args.length == 0) {
             Bukkit.dispatchCommand(sender, "at help map");
-            return false;
+            return true;
         }
 
         // Get the subcommand in question
         SubATCommand subATCommand = subMapCommands.get(args[0].toLowerCase());
         if (subATCommand == null) {
             Bukkit.dispatchCommand(sender, "at help map");
-            return false;
+            return true;
         }
 
         // Check permissions
         if (!sender.hasPermission("at.member.core.map." + args[0].toLowerCase())) {
             Bukkit.dispatchCommand(sender, "at help map");
-            return false;
+            return true;
         }
 
         // Execute
-        return subATCommand.onCommand(sender, command, s, Arrays.copyOfRange(args, 1, args.length));
+        boolean result = subATCommand.onCommand(sender, command, s, Arrays.copyOfRange(args, 1, args.length));
+
+        if (!result) {
+            CustomMessages.sendMessage(sender, "Error.commandUse",
+                    Placeholder.unparsed("usage", CustomMessages.asString("Usages.Subcommands.map." + args[0].toLowerCase())));
+        }
+        return true;
     }
 
     @Override
diff --git a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/ParticlesCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/ParticlesCommand.java
index 8ff6710c..3aa34038 100644
--- a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/ParticlesCommand.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/ParticlesCommand.java
@@ -67,7 +67,7 @@ public boolean onCommand(
             if (data == null) data = "default";
             String type = args[0];
             if (!types.contains(type)) {
-                return false;
+                return true;
             }
             MainConfig.get().set("waiting-particles." + type, data);
             CustomMessages.sendMessage(
diff --git a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/PurgeCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/PurgeCommand.java
index 479132a8..8bae056d 100644
--- a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/PurgeCommand.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/PurgeCommand.java
@@ -123,7 +123,7 @@ public boolean onCommand(
                             CoreClass.sync);
         }
 
-        return false;
+        return true;
     }
 
     @Override
diff --git a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/ShowCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/ShowCommand.java
index bf027cdb..fddf9428 100644
--- a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/ShowCommand.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/ShowCommand.java
@@ -9,10 +9,11 @@
 public class ShowCommand extends SubATCommand {
     @Override
     public boolean onCommand(
-            @NotNull final CommandSender sender,
-            @NotNull final Command command,
-            @NotNull final String s,
-            @NotNull final String[] args) {
-        return false;
+        @NotNull final CommandSender sender,
+        @NotNull final Command command,
+        @NotNull final String s,
+        @NotNull final String[] args
+    ) {
+        return true;
     }
 }
diff --git a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/map/AbstractMapCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/map/AbstractMapCommand.java
index d16b31eb..a8031c17 100644
--- a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/map/AbstractMapCommand.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/map/AbstractMapCommand.java
@@ -52,7 +52,7 @@ public boolean onCommand(
         // If not enough arguments are specified, let the player know
         if (args.length < 3) {
             CustomMessages.sendMessage(sender, "Error.notEnoughArgs");
-            return true;
+            return false;
         }
 
         // Squish together the input
@@ -67,7 +67,7 @@ public boolean onCommand(
             case "home" -> {
                 if (args.length < 4) {
                     CustomMessages.sendMessage(sender, "Error.notEnoughArgs");
-                    return true;
+                    return false;
                 }
 
                 input = String.join(" ", Arrays.copyOfRange(args, 3, args.length));
diff --git a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/DelHomeCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/DelHomeCommand.java
index ed19715e..8ae5ec96 100644
--- a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/DelHomeCommand.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/DelHomeCommand.java
@@ -56,7 +56,10 @@ public boolean onCommand(
             } else {
                 CustomMessages.sendMessage(sender, "Error.noHomes");
             }
-        } else CustomMessages.sendMessage(sender, "Error.noHomeInput");
+        } else {
+            CustomMessages.sendMessage(sender, "Error.noHomeInput");
+            return false;
+        }
 
         return true;
     }
diff --git a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/MoveHomeCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/MoveHomeCommand.java
index 5050f848..99f8ef83 100644
--- a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/MoveHomeCommand.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/MoveHomeCommand.java
@@ -38,6 +38,7 @@ public boolean onCommand(
                 }
             } else {
                 CustomMessages.sendMessage(sender, "Error.noHomeInput");
+                return false;
             }
             return true;
         }
diff --git a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/SetHomeCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/SetHomeCommand.java
index 1162bc52..62bcacc4 100644
--- a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/SetHomeCommand.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/SetHomeCommand.java
@@ -51,6 +51,7 @@ public boolean onCommand(
                 ((ATFloodgatePlayer) atPlayer).sendSetHomeForm();
             } else {
                 CustomMessages.sendMessage(sender, "Error.noHomeInput");
+                return false;
             }
 
             return true;
diff --git a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/SetMainHomeCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/SetMainHomeCommand.java
index d1345fdb..dd8e0ee6 100644
--- a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/SetMainHomeCommand.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/SetMainHomeCommand.java
@@ -34,6 +34,7 @@ public boolean onCommand(
                 ((ATFloodgatePlayer) atPlayer).sendSetMainHomeForm();
             } else {
                 CustomMessages.sendMessage(sender, "Error.noHomeInput");
+                return false;
             }
             return true;
         }
diff --git a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/spawn/MirrorSpawn.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/spawn/MirrorSpawn.java
index 4aafae12..6a2d379d 100644
--- a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/spawn/MirrorSpawn.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/spawn/MirrorSpawn.java
@@ -36,7 +36,7 @@ public boolean onCommand(
         // If no argument has been specified, stop there
         if (args.length == 0) {
             CustomMessages.sendMessage(sender, "Error.mirrorSpawnNoArguments");
-            return true;
+            return false;
         }
 
         // If just one spawn has been specified, then use the first argument as the spawn to mirror
diff --git a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/spawn/RemoveSpawn.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/spawn/RemoveSpawn.java
index ef3fe777..9af0cc0c 100644
--- a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/spawn/RemoveSpawn.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/spawn/RemoveSpawn.java
@@ -39,7 +39,7 @@ public boolean onCommand(
                 removingSpawn = player.getWorld().getName();
             } else {
                 CustomMessages.sendMessage(sender, "Error.removeSpawnNoArgs");
-                return true;
+                return false;
             }
         }
 
diff --git a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpBlockCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpBlockCommand.java
index ee54a394..1a9d6d20 100644
--- a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpBlockCommand.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpBlockCommand.java
@@ -38,6 +38,7 @@ public boolean onCommand(
                 }
             } else {
                 CustomMessages.sendMessage(sender, "Error.noPlayerInput");
+                return false;
             }
             return true;
         }
diff --git a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpHereOffline.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpHereOffline.java
index c3e55d49..d6de1a61 100644
--- a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpHereOffline.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpHereOffline.java
@@ -29,7 +29,7 @@ public boolean onCommand(
 
         if (args.length == 0) {
             CustomMessages.sendMessage(sender, "Error.noPlayerInput");
-            return true;
+            return false;
         }
         Player target = Bukkit.getPlayer(args[0]);
         if (target == null) {
diff --git a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpOffline.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpOffline.java
index 2ef4c02c..82295528 100644
--- a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpOffline.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpOffline.java
@@ -28,7 +28,7 @@ public boolean onCommand(
         if (!canProceed(sender)) return true;
         if (args.length == 0) {
             CustomMessages.sendMessage(sender, "Error.noPlayerInput");
-            return true;
+            return false;
         }
         Player target = Bukkit.getPlayer(args[0]);
         if (target != null) {
diff --git a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpUnblock.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpUnblock.java
index 61d1dfa3..3e85bf11 100644
--- a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpUnblock.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpUnblock.java
@@ -38,6 +38,7 @@ public boolean onCommand(
                 }
             } else {
                 CustomMessages.sendMessage(sender, "Error.noPlayerInput");
+                return false;
             }
             return true;
         }
diff --git a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/Tpa.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/Tpa.java
index 6ee35ae1..2559242e 100644
--- a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/Tpa.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/Tpa.java
@@ -47,6 +47,7 @@ public boolean onCommand(
                 }
             } else {
                 CustomMessages.sendMessage(sender, "Error.noPlayerInput");
+                return false;
             }
             return true;
         }
diff --git a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpaHere.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpaHere.java
index 0d289c8c..9dc47045 100644
--- a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpaHere.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpaHere.java
@@ -45,6 +45,7 @@ public boolean onCommand(
                 }
             } else {
                 CustomMessages.sendMessage(sender, "Error.noPlayerInput");
+                return false;
             }
             return true;
         }
diff --git a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/Tpo.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/Tpo.java
index 5265a117..6d9e95a1 100644
--- a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/Tpo.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/Tpo.java
@@ -38,6 +38,7 @@ public boolean onCommand(
                 }
             } else {
                 CustomMessages.sendMessage(sender, "Error.noPlayerInput");
+                return false;
             }
             return true;
         }
diff --git a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpoHere.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpoHere.java
index a80660b1..5ec1ec41 100644
--- a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpoHere.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpoHere.java
@@ -37,6 +37,7 @@ public boolean onCommand(
                 }
             } else {
                 CustomMessages.sendMessage(sender, "Error.noPlayerInput");
+                return false;
             }
             return true;
         }
diff --git a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/DeleteWarpCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/DeleteWarpCommand.java
index 9f951ad7..8d35cc45 100644
--- a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/DeleteWarpCommand.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/DeleteWarpCommand.java
@@ -43,7 +43,7 @@ public boolean onCommand(
 
             // Otherwise, tell the player to enter a warp.
             CustomMessages.sendMessage(sender, "Error.noWarpInput");
-            return true;
+            return false;
         }
 
         // Get the warp to be deleted.
@@ -62,6 +62,7 @@ public boolean onCommand(
                                             Placeholder.unparsed("warp", args[0])));
         } else {
             CustomMessages.sendMessage(sender, "Error.noWarpInput");
+            return false;
         }
         return true;
     }
diff --git a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/MoveWarpCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/MoveWarpCommand.java
index 07e4925d..ffaf0913 100644
--- a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/MoveWarpCommand.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/MoveWarpCommand.java
@@ -42,6 +42,7 @@ public boolean onCommand(
                 }
             } else {
                 CustomMessages.sendMessage(sender, "Error.noWarpInput");
+                return false;
             }
             return true;
         }
diff --git a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/SetWarpCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/SetWarpCommand.java
index 948a9694..9c4fca39 100644
--- a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/SetWarpCommand.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/SetWarpCommand.java
@@ -37,6 +37,7 @@ public boolean onCommand(
                 ((ATFloodgatePlayer) atPlayer).sendSetWarpForm();
             } else {
                 CustomMessages.sendMessage(sender, "Error.noWarpInput");
+                return false;
             }
             return true;
         }
diff --git a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/WarpCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/WarpCommand.java
index 3bdff2cd..4513df06 100644
--- a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/WarpCommand.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/WarpCommand.java
@@ -43,6 +43,7 @@ public boolean onCommand(
                 }
             } else {
                 CustomMessages.sendMessage(sender, "Error.noWarpInput");
+                return false;
             }
             return true;
         }
diff --git a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/config/CustomMessages.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/config/CustomMessages.java
index 06a7bb04..e7a27322 100644
--- a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/config/CustomMessages.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/config/CustomMessages.java
@@ -402,6 +402,9 @@ If you prefer to use the Legacy Code format (i.e. &a, &b, etc.) then you can sti
                 "Error.randomLocFailed",
                 "<prefix> <gray>Sorry, we couldn't find a location to teleport you to :(");
 
+        addDefault("Error.commandUse", "<aqua>Usage: <gray><usage>");
+        addDefault("Error.rtpManagerNotUsed", "<prefix> <gray>The RTP-Cache is not being used on the server.");
+
         makeSectionLenient("Info");
         addDefault("Info.tpOff", "<prefix> <gray>Successfully disabled teleport requests!");
         addDefault("Info.tpOn", "<prefix> <gray>Successfully enabled teleport requests!");
@@ -606,6 +609,9 @@ If you prefer to use the Legacy Code format (i.e. &a, &b, etc.) then you can sti
                 "Info.mirrorSpawnSame",
                 "<prefix> <gray>The spawns for <aqua><from></aqua> and <aqua><spawn></aqua> already to go the same place! Don't worry :)");
 
+        addDefault("Info.clearEverything", "<prefix> <gray>The RTP-Cache has been cleared.");
+        addDefault("Info.clearWorld", "<prefix> <gray>Cache for world <aqua><world></aqua> has been cleared.");
+
         addDefault("Tooltip.homes", "<prefix> <gray>Teleports you to your home: <aqua><home>");
         addDefault("Tooltip.warps", "<prefix> <gray>Teleports you to warp: <aqua><warp>");
         addDefault(
diff --git a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/managers/CommandManager.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/managers/CommandManager.java
index 2c565c1e..4d0642ee 100644
--- a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/managers/CommandManager.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/managers/CommandManager.java
@@ -9,13 +9,12 @@
 import io.github.niestrat99.advancedteleport.commands.spawn.*;
 import io.github.niestrat99.advancedteleport.commands.teleport.*;
 import io.github.niestrat99.advancedteleport.commands.warp.*;
+import io.github.niestrat99.advancedteleport.config.CustomMessages;
 import io.github.niestrat99.advancedteleport.config.MainConfig;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 
 import org.bukkit.Bukkit;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandMap;
-import org.bukkit.command.PluginCommand;
-import org.bukkit.command.SimpleCommandMap;
+import org.bukkit.command.*;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
@@ -162,7 +161,15 @@ private static void register(String name, ATCommand atCommand) {
         }
 
         if (command.getExecutor() != atCommand) {
-            command.setExecutor(atCommand);
+            CommandExecutor usageExecutor = (sender, cmd, label, args) -> {
+                boolean result = atCommand.onCommand(sender, cmd, label, args);
+                if (!result) {
+                    CustomMessages.sendMessage(sender, "Error.commandUse",
+                            Placeholder.unparsed("usage", CustomMessages.asString("Usages." + name)));
+                }
+                return true;
+            };
+            command.setExecutor(usageExecutor);
             command.setTabCompleter(atCommand);
         }