diff --git a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/GetDataRunnable.java b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/GetDataRunnable.java
index 4e044bc..e4c9710 100644
--- a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/GetDataRunnable.java
+++ b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/GetDataRunnable.java
@@ -68,7 +68,7 @@ import org.openstreetmap.josm.tools.Utils;
 public class GetDataRunnable extends RecursiveTask<DataSet> {
     /**
      * This is functionally equivalent to
-     * {@link org.openstreetmap.josm.data.validation.tests.DuplicateNode#NodeHash}
+     * {@link org.openstreetmap.josm.data.validation.tests.DuplicateNode.NodeHash}
      */
     private static class ILatLonHash implements Hash<Object, Object> {
         private static final double PRECISION = DEGREE_BUFFER;
@@ -76,6 +76,8 @@ public class GetDataRunnable extends RecursiveTask<DataSet> {
         /**
          * Returns the rounded coordinated according to {@link #PRECISION}
          *
+         * @param coor The coordinate to round
+         * @return The rounded coordinate
          * @see LatLon#roundToOsmPrecision
          */
         private static ILatLon roundCoord(ILatLon coor) {
@@ -484,8 +486,8 @@ public class GetDataRunnable extends RecursiveTask<DataSet> {
     }
 
     /**
-     * Create an efficient collection ({@link Storage}) of {@link List<Node>} and
-     * {@link Node} objects
+     * Create an efficient collection ({@link Storage}) of {@link List} of
+     * {@link Node}s and {@link Node} objects
      *
      * @param dataSet The dataset to get nodes from
      * @return The storage to use
diff --git a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/data/mapwithai/MapWithAIInfo.java b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/data/mapwithai/MapWithAIInfo.java
index 541367e..39f7407 100644
--- a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/data/mapwithai/MapWithAIInfo.java
+++ b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/data/mapwithai/MapWithAIInfo.java
@@ -659,7 +659,7 @@ public class MapWithAIInfo extends
      * Get the key that indicates an object is already conflated, and if so, to what
      * Please note that it may be `true`/`false` instead of an object id.
      *
-     * return The key returned by the server indicating the conflation object
+     * @return The key returned by the server indicating the conflation object
      */
     public String getAlreadyConflatedKey() {
         return alreadyConflatedKey;
diff --git a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/io/mapwithai/ESRISourceReader.java b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/io/mapwithai/ESRISourceReader.java
index 4a3e5da..f90cc98 100644
--- a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/io/mapwithai/ESRISourceReader.java
+++ b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/io/mapwithai/ESRISourceReader.java
@@ -201,8 +201,9 @@ public class ESRISourceReader {
     /**
      * Get the json string for a URL
      *
-     * @param url      The URL to get
-     * @param fastFail Fail fast (1 second)
+     * @param url           The URL to get
+     * @param fastFail      Fail fast (1 second)
+     * @param defaultMaxAge the default max age for the response to be cached
      * @return The json string, or {@code null}.
      */
     @Nullable
diff --git a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/tools/Access.java b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/tools/Access.java
index fee7747..da98cff 100644
--- a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/tools/Access.java
+++ b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/tools/Access.java
@@ -405,10 +405,10 @@ public final class Access {
     }
 
     /**
-     * The key for children modes for the map, see {@link Access#getAccessMethods}
+     * The key for children modes for the map, see {@link Access#accessMethods}
      */
     public static final String CHILDREN = "children";
-    /** The key for parent modes for the map, see {@link Access#getAccessMethods} */
+    /** The key for parent modes for the map, see {@link Access#accessMethods} */
     public static final String PARENT = "parent";
     /** This set has keys that indicate that access is possible */
     private static final Set<String> POSITIVE_ACCESS = new HashSet<>(
diff --git a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/tools/MapPaintUtils.java b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/tools/MapPaintUtils.java
index d5ed4ca..0c67374 100644
--- a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/tools/MapPaintUtils.java
+++ b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/tools/MapPaintUtils.java
@@ -75,6 +75,8 @@ public final class MapPaintUtils {
 
         /**
          * Get the safe color
+         *
+         * @return The safe color
          */
         public Color getColor() {
             return new Color(this.color.getRGB());