diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/core/CuboidEnterExitSmartEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/core/CuboidEnterExitSmartEvent.java
index 1c782a7183..19757d5dbf 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/events/core/CuboidEnterExitSmartEvent.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/events/core/CuboidEnterExitSmartEvent.java
@@ -86,6 +86,9 @@ public void breakDown() {
         PlayerMoveEvent.getHandlerList().unregister(this);
         PlayerTeleportEvent.getHandlerList().unregister(this);
         PlayerChangedWorldEvent.getHandlerList().unregister(this);
+        PlayerQuitEvent.getHandlerList().unregister(this);
+        PlayerJoinEvent.getHandlerList().unregister(this);
+        VehicleMoveEvent.getHandlerList().unregister(this);
     }
 
     //////////////
@@ -149,6 +152,7 @@ public void onPlayerJoin(PlayerJoinEvent event) {
         internalRun(pme, "join");
     }
 
+    @EventHandler
     public void onWorldChange(PlayerChangedWorldEvent event) {
         if (EntityTag.isNPC(event.getPlayer())) {
             return;
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/NoteCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/NoteCommand.java
index 5dcd672b2a..cefba4c3cb 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/NoteCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/NoteCommand.java
@@ -35,7 +35,7 @@ public class NoteCommand extends AbstractCommand {
     //
     // @Usage
     // Use to add a notable cuboid.
-    // - note cu@1,2,3,world|4,5,6,world as:mycuboid
+    // - note cu@world,1,2,3,10,11,12 as:mycuboid
     //
     // @Usage
     // Use to remove a notable cuboid.