diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/net/NetConfig.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/net/NetConfig.java
index fabaa370..20d14c38 100644
--- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/net/NetConfig.java
+++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/net/NetConfig.java
@@ -10,7 +10,7 @@ import fr.neatmonster.nocheatplus.permissions.Permissions;
 
 /**
  * Configuration for the net checks (fast version, sparse).
- * @author web4web1
+ * @author asofold
  *
  */
 public class NetConfig extends ACheckConfig {
diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/net/NetConfigCache.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/net/NetConfigCache.java
index 0c684aab..129784da 100644
--- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/net/NetConfigCache.java
+++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/net/NetConfigCache.java
@@ -8,7 +8,7 @@ import fr.neatmonster.nocheatplus.config.WorldConfigCache;
 
 /**
  * Copy-on-write per-world configuration cache.
- * @author web4web1
+ * @author asofold
  *
  */
 public class NetConfigCache extends WorldConfigCache<NetConfig> implements CheckConfigFactory {
diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/net/NetData.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/net/NetData.java
index 5a279234..0e59e891 100644
--- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/net/NetData.java
+++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/net/NetData.java
@@ -5,7 +5,7 @@ import fr.neatmonster.nocheatplus.utilities.ActionFrequency;
 
 /**
  * Primary thread only.
- * @author web4web1
+ * @author asofold
  *
  */
 public class NetData extends ACheckData {
diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/net/NetDataFactory.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/net/NetDataFactory.java
index e9126ece..b943ecb9 100644
--- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/net/NetDataFactory.java
+++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/net/NetDataFactory.java
@@ -9,7 +9,7 @@ import fr.neatmonster.nocheatplus.checks.access.CheckDataFactory;
 
 /**
  * Currently primary thread only!
- * @author web4web1
+ * @author asofold
  *
  */
 public class NetDataFactory implements CheckDataFactory {
diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/clients/motd/JourneyMapMOTD.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/clients/motd/JourneyMapMOTD.java
index 887d98b8..a26ed7af 100644
--- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/clients/motd/JourneyMapMOTD.java
+++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/clients/motd/JourneyMapMOTD.java
@@ -5,7 +5,7 @@ import org.bukkit.entity.Player;
 
 /**
  * JourneyMap + VoxelMap mod.
- * @author web4web1
+ * @author asofold
  *
  */
 public class JourneyMapMOTD extends ClientMOTD {
diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/compat/versions/Bugs.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/compat/versions/Bugs.java
index 1c8175c3..f4e70a34 100644
--- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/compat/versions/Bugs.java
+++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/compat/versions/Bugs.java
@@ -10,7 +10,7 @@ import fr.neatmonster.nocheatplus.components.NoCheatPlusAPI;
 
 /**
  * Feature selection, based on the version.
- * @author web4web1
+ * @author asofold
  *
  */
 public class Bugs {
diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/ConfigCache.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/ConfigCache.java
index 6409efad..01a8e760 100644
--- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/ConfigCache.java
+++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/ConfigCache.java
@@ -7,7 +7,7 @@ import fr.neatmonster.nocheatplus.utilities.ds.corw.LinkedHashMapCOW;
 
 /**
  * Simple cache for configurations, adding some convenience functionality.
- * @author web4web1
+ * @author asofold
  *
  */
 public abstract class ConfigCache <K, C> {
diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/WorldConfigCache.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/WorldConfigCache.java
index 523d5eb0..18ce621e 100644
--- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/WorldConfigCache.java
+++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/WorldConfigCache.java
@@ -4,7 +4,7 @@ import org.bukkit.World;
 
 /**
  * World-specific cache for configurations. World names are used as keys, convenience methods are added.
- * @author web4web1
+ * @author asofold
  *
  * @param <C>
  */
diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/hooks/NCPExemptionManager.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/hooks/NCPExemptionManager.java
index 3f4ec030..9768525f 100644
--- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/hooks/NCPExemptionManager.java
+++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/hooks/NCPExemptionManager.java
@@ -42,20 +42,21 @@ public class NCPExemptionManager {
     /**
      * Exempt an entity from all checks permanently.
      * 
-     * @param entityId
-     *            the entity id
+     * @param id
+     *            The unique id.
      */
     public static final void exemptPermanently(final UUID id) {
         exemptPermanently(id, CheckType.ALL);
     }
 
     /**
-     * Exempt an entity from the given check or check group permanently (only until restart).
+     * Exempt an entity from the given check or check group permanently (only
+     * until restart).
      * 
-     * @param entityId
-     *            the entity id
+     * @param id
+     *            The unique id.
      * @param checkType
-     *            the check type
+     *            The check type.
      */
     public static final void exemptPermanently(final UUID id, final CheckType checkType) {
         exempted.get(checkType).add(id);
@@ -78,9 +79,9 @@ public class NCPExemptionManager {
      * Exempt a player from a check or check group permanently.
      * 
      * @param player
-     *            the player
+     *            The player to exempt.
      * @param checkType
-     *            the check type
+     *            The check type.
      */
     public static final void exemptPermanently(final Player player, final CheckType checkType) {
         exemptPermanently(player.getUniqueId(), checkType);
@@ -89,15 +90,16 @@ public class NCPExemptionManager {
     /**
      * Check if an entity is exempted from a check right now by entity id.
      * <hr>
-     * This might help exempting NPCs from checks for all time, making performance a lot better. A future purpose might
-     * be to exempt vehicles and similar (including passengers) from checks.
+     * This might help exempting NPCs from checks for all time, making
+     * performance a lot better. A future purpose might be to exempt vehicles
+     * and similar (including passengers) from checks.
      * 
-     * @param entityId
-     *            the entity id to exempt from checks
+     * @param id
+     *            The unique id.
      * @param checkType
-     *            the type of check to exempt the player from. This can be individual check types, as well as a check
-     *            group like MOVING or ALL
-     * @return if the entity is exempted from checks right now
+     *            This can be individual check types, as well as a check group
+     *            like MOVING or ALL.
+     * @return If the entity is exempted from checks right now.
      */
     public static final boolean isExempted(final UUID id, final CheckType checkType) {
         return exempted.get(checkType).contains(id);
@@ -107,11 +109,11 @@ public class NCPExemptionManager {
      * Check if a player is exempted from a check right now.
      * 
      * @param player
-     *            the player to exempt from checks
+     *            The player to exempt from checks
      * @param checkType
-     *            the type of check to exempt the player from. This can be individual check types, as well as a check
-     *            group like MOVING or ALL
-     * @return if the player is exempted from the check right now
+     *            This can be individual check types, as well as a check group
+     *            like MOVING or ALL.
+     * @return If the player is exempted from the check right now.
      */
     public static final boolean isExempted(final Player player, final CheckType checkType) {
         return isExempted(player.getUniqueId(), checkType);
@@ -121,7 +123,7 @@ public class NCPExemptionManager {
      * Undo exempting an entity from all checks.
      * 
      * @param id
-     *            Unique id of a player to exempt.
+     *            The unique id.
      */
     public static final void unexempt(final UUID id) {
         unexempt(id, CheckType.ALL);
@@ -130,10 +132,10 @@ public class NCPExemptionManager {
     /**
      * Undo exempting an entity from a certain check, or check group, as given.
      * 
-     * @param entityId
-     *            the entity id
+     * @param id
+     *            The unique id.
      * @param checkType
-     *            the check type
+     *            The check type.
      */
     public static final void unexempt(final UUID id,  final CheckType checkType) {
         exempted.get(checkType).remove(id);
diff --git a/NCPPlugin/src/test/java/fr/neatmonster/nocheatplus/PluginTests.java b/NCPPlugin/src/test/java/fr/neatmonster/nocheatplus/PluginTests.java
index bc12afef..fbc3cbdc 100644
--- a/NCPPlugin/src/test/java/fr/neatmonster/nocheatplus/PluginTests.java
+++ b/NCPPlugin/src/test/java/fr/neatmonster/nocheatplus/PluginTests.java
@@ -15,7 +15,7 @@ public class PluginTests {
 
     /**
      * Dummy API, providing only a minimal subset of functionality for offline-testing. Some methods do nothing, some throw an UnsupportedOperationException, some will do something (set/get MCAccess).
-     * @author web4web1
+     * @author asofold
      *
      */
     public static class DummyNoCheatPlusAPI implements NoCheatPlusAPI {