diff --git a/Plan/bukkit/src/main/java/com/djrapitops/plan/utilities/java/Reflection.java b/Plan/bukkit/src/main/java/com/djrapitops/plan/utilities/java/Reflection.java
index 0a877580d..1372a529d 100644
--- a/Plan/bukkit/src/main/java/com/djrapitops/plan/utilities/java/Reflection.java
+++ b/Plan/bukkit/src/main/java/com/djrapitops/plan/utilities/java/Reflection.java
@@ -270,7 +270,7 @@ public final class Reflection {
      * <p>
      * Strings enclosed with curly brackets - such as {TEXT} - will be replaced according to the following table:
      * </p>
-     * <table border="1">
+     * <table border="1" summary="Variables and description">
      * <tr>
      * <th>Variable</th>
      * <th>Content</th>
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/CommandUseTable.java b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/CommandUseTable.java
index c6db18e6c..1c6d2d07a 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/CommandUseTable.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/CommandUseTable.java
@@ -39,7 +39,7 @@ import java.util.UUID;
  * <p>
  * Table Name: plan_commandusages
  * <p>
- * For contained columns {@see Col}
+ * For contained columns {@link Col}
  *
  * @author Rsl1122
  */
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/NicknamesTable.java b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/NicknamesTable.java
index 88a8662f9..eee04a45e 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/NicknamesTable.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/NicknamesTable.java
@@ -157,8 +157,10 @@ public class NicknamesTable extends UserUUIDTable {
     /**
      * Get nicknames of all users but doesn't map them by Server
      *
+     * See {@link NicknamesTable#getAllNicknames}
+     *
      * @return a {@code Map<UUID, List<Nickname>} with all nicknames of all users
-     * @see NicknamesTable#getAllNicknames();
+     *
      */
     public Map<UUID, List<Nickname>> getAllNicknamesUnmapped() {
         String sql = "SELECT " +
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/SecurityTable.java b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/SecurityTable.java
index bb226c620..c427e8155 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/SecurityTable.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/SecurityTable.java
@@ -36,7 +36,7 @@ import java.util.List;
  * <p>
  * Table Name: plan_security
  * <p>
- * For contained columns {@see Col}
+ * For contained columns {@link Col}
  *
  * @author Rsl1122
  * @see WebUser
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/ServerTable.java b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/ServerTable.java
index 7be61db68..349ef0d7e 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/ServerTable.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/ServerTable.java
@@ -35,7 +35,7 @@ import java.util.*;
  * <p>
  * Table Name: plan_servers
  * <p>
- * For contained columns {@see Col}
+ * For contained columns {@link Col}
  *
  * @author Rsl1122
  * @see Server
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/TPSTable.java b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/TPSTable.java
index a56d778db..c606d38cd 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/TPSTable.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/TPSTable.java
@@ -38,11 +38,11 @@ import java.sql.SQLException;
 import java.util.*;
 
 /**
- * Table that is in charge of storing TPS, Players Online & Performance data.
+ * Table that is in charge of storing TPS, Players Online and Performance data.
  * <p>
  * Table Name: plan_tps
  * <p>
- * For contained columns {@see Col}
+ * For contained columns {@link Col}
  *
  * @author Rsl1122
  */
@@ -122,9 +122,6 @@ public class TPSTable extends Table {
         });
     }
 
-    /**
-     * @return @throws SQLException
-     */
     public List<TPS> getTPSData() {
         return getTPSData(getServerUUID());
     }
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/UsersTable.java b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/UsersTable.java
index 9d5eb0a75..9cc8fc8e7 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/UsersTable.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/UsersTable.java
@@ -38,7 +38,7 @@ import java.util.*;
  * <p>
  * Table Name: plan_users
  * <p>
- * For contained columns {@see Col}
+ * For contained columns {@link Col}
  *
  * @author Rsl1122
  */
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/tables/HtmlTables.java b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/tables/HtmlTables.java
index 5262540f4..2fa97b759 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/tables/HtmlTables.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/tables/HtmlTables.java
@@ -88,7 +88,7 @@ public class HtmlTables {
     /**
      * Create a new Kill table.
      *
-     * @param kills List of {@link PlayerKill]s to be added to the table.
+     * @param kills List of {@link PlayerKill}s to be added to the table.
      * @param color Color the table header should be.
      * @return a new {@link KillsTable}.
      */