diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/MultiverseCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/MultiverseCommand.java
index 17cc7946..9790b110 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/commands/MultiverseCommand.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/commands/MultiverseCommand.java
@@ -23,6 +23,9 @@ public abstract class MultiverseCommand extends Command {
      * The reference to the core.
      */
     protected MultiverseCore plugin;
+    /**
+     * The reference to {@link MVMessaging}.
+     */
     protected MVMessaging messaging;
 
     public MultiverseCommand(MultiverseCore plugin) {
diff --git a/src/main/java/com/onarandombox/MultiverseCore/event/MVPlayerTouchedPortalEvent.java b/src/main/java/com/onarandombox/MultiverseCore/event/MVPlayerTouchedPortalEvent.java
index 6bf0e496..0e293ee7 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/event/MVPlayerTouchedPortalEvent.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/event/MVPlayerTouchedPortalEvent.java
@@ -26,10 +26,18 @@ public class MVPlayerTouchedPortalEvent extends Event implements Cancellable {
         this.l = l;
     }
 
+    /**
+     * Gets the {@link Location} of the portal-block that was touched.
+     * @return The {@link Location} of the portal-block that was touched.
+     */
     public Location getBlockTouched() {
         return this.l;
     }
 
+    /**
+     * Gets the {@link Player} that's touching the portal.
+     * @return The {@link Player} that's touching the portal.
+     */
     public Player getPlayer() {
         return this.p;
     }
diff --git a/src/main/java/com/onarandombox/MultiverseCore/event/MVRespawnEvent.java b/src/main/java/com/onarandombox/MultiverseCore/event/MVRespawnEvent.java
index 71596214..fba5c8d2 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/event/MVRespawnEvent.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/event/MVRespawnEvent.java
@@ -12,7 +12,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 
 /**
- * Called
+ * Called when a player is respawning.
  */
 public class MVRespawnEvent extends Event {
     private Player player;
@@ -27,18 +27,34 @@ public class MVRespawnEvent extends Event {
         this.respawnMethod = respawnMethod;
     }
 
+    /**
+     * Gets the {@link Player} that's respawning.
+     * @return The {@link Player} that's respawning.
+     */
     public Player getPlayer() {
         return this.player;
     }
 
+    /**
+     * Gets the respawn-method.
+     * @return The respawn-method.
+     */
     public String getRespawnMethod() {
         return this.respawnMethod;
     }
 
+    /**
+     * Gets the player's respawn-{@link Location}.
+     * @return The player's respawn-{@link Location}.
+     */
     public Location getPlayersRespawnLocation() {
         return this.location;
     }
 
+    /**
+     * Sets the player's respawn-{@link Location}.
+     * @param l The new respawn-{@link Location}.
+     */
     public void setRespawnLocation(Location l) {
         this.location = l;
     }
diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVEntityListener.java b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVEntityListener.java
index 7e1eacf3..a7b90389 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVEntityListener.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVEntityListener.java
@@ -29,6 +29,9 @@ import org.bukkit.event.entity.FoodLevelChangeEvent;
 import java.util.List;
 import java.util.logging.Level;
 
+/**
+ * Multiverse's {@link EntityListener}.
+ */
 public class MVEntityListener extends EntityListener {
 
     private MultiverseCore plugin;
@@ -73,6 +76,7 @@ public class MVEntityListener extends EntityListener {
 
     /**
      * Handle Animal/Monster Spawn settings, seems like a more concrete method than using CraftBukkit.
+     * @param event The event.
      */
     @Override
     public void onCreatureSpawn(CreatureSpawnEvent event) {
diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPluginListener.java b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPluginListener.java
index 44ea635f..84e34c84 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPluginListener.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPluginListener.java
@@ -16,6 +16,9 @@ import org.bukkit.event.server.ServerListener;
 import java.util.Arrays;
 import java.util.logging.Level;
 
+/**
+ * Multiverse's {@link ServerListener}.
+ */
 public class MVPluginListener extends ServerListener {
 
     private MultiverseCore plugin;
@@ -24,7 +27,10 @@ public class MVPluginListener extends ServerListener {
         this.plugin = plugin;
     }
 
-    /** Keep an eye out for Plugins which we can utilize. */
+    /**
+     * Keep an eye out for Plugins which we can utilize.
+     * @param event The event.
+     */
     @Override
     public void onPluginEnable(PluginEnableEvent event) {
         // Let AllPay handle all econ plugin loadings, only go for econ plugins we support
@@ -38,7 +44,10 @@ public class MVPluginListener extends ServerListener {
         }
     }
 
-    /** We'll check if any of the plugins we rely on decide to Disable themselves. */
+    /**
+     * We'll check if any of the plugins we rely on decide to Disable themselves.
+     * @param event The event.
+     */
     @Override
     public void onPluginDisable(PluginDisableEvent event) {
         // TODO: Disable econ when it disables.
diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPortalAdjustListener.java b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPortalAdjustListener.java
index cc64ab42..0dfc20b2 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPortalAdjustListener.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPortalAdjustListener.java
@@ -11,11 +11,17 @@ import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.utils.SafeTTeleporter;
 import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.event.Event.Type;
 import org.bukkit.event.player.PlayerListener;
 import org.bukkit.event.player.PlayerPortalEvent;
 
 import java.util.logging.Level;
 
+/**
+ * Multiverse's second {@link PlayerListener}.
+ * <p>
+ * Used to double-monitor {@link Type#PLAYER_PORTAL}.
+ */
 public class MVPortalAdjustListener extends PlayerListener {
 
     private MultiverseCore plugin;
diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVWeatherListener.java b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVWeatherListener.java
index 7c97a949..d6a0ad81 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVWeatherListener.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVWeatherListener.java
@@ -13,6 +13,9 @@ import org.bukkit.event.weather.ThunderChangeEvent;
 import org.bukkit.event.weather.WeatherChangeEvent;
 import org.bukkit.event.weather.WeatherListener;
 
+/**
+ * Multiverse's {@link WeatherListener}.
+ */
 public class MVWeatherListener extends WeatherListener {
     private MultiverseCore plugin;
 
@@ -22,7 +25,6 @@ public class MVWeatherListener extends WeatherListener {
 
     @Override
     public void onWeatherChange(WeatherChangeEvent event) {
-
         MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(event.getWorld().getName());
         if (world != null) {
             // If it's going to start raining and we have weather disabled
@@ -32,7 +34,6 @@ public class MVWeatherListener extends WeatherListener {
 
     @Override
     public void onThunderChange(ThunderChangeEvent event) {
-
         MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(event.getWorld().getName());
         if (world != null) {
             // If it's going to start raining and we have weather disabled