diff --git a/src/main/java/pythagoras/d/Box.java b/src/main/java/pythagoras/d/Box.java
index a4afc7a..10be3b6 100644
--- a/src/main/java/pythagoras/d/Box.java
+++ b/src/main/java/pythagoras/d/Box.java
@@ -45,8 +45,8 @@ public class Box implements IBox, Serializable
     }
 
     /**
-     * Sets the parameters of the box to the empty values ({@link Vector3f#MAX_VALUE} and
-     * {@link Vector3f#MIN_VALUE} for the minimum and maximum, respectively).
+     * Sets the parameters of the box to the empty values ({@link Vector3#MAX_VALUE} and
+     * {@link Vector3#MIN_VALUE} for the minimum and maximum, respectively).
      *
      * @return a reference to this box, for chaining.
      */
diff --git a/src/main/java/pythagoras/d/IQuaternion.java b/src/main/java/pythagoras/d/IQuaternion.java
index 98f0c75..2478a00 100644
--- a/src/main/java/pythagoras/d/IQuaternion.java
+++ b/src/main/java/pythagoras/d/IQuaternion.java
@@ -32,9 +32,9 @@ public interface IQuaternion
     boolean hasNaN ();
 
     /**
-     * Computes the angles to pass to {@link #fromAngles} to reproduce this rotation, placing them
-     * in the provided vector. This uses the factorization method described in David Eberly's
-     * <a href="http://www.geometrictools.com/Documentation/EulerAngles.pdf">Euler Angle
+     * Computes the angles to pass to {@link Quaternion#fromAngles} to reproduce this rotation,
+     * placing them in the provided vector. This uses the factorization method described in David
+     * Eberly's <a href="http://www.geometrictools.com/Documentation/EulerAngles.pdf">Euler Angle
      * Formulas</a>.
      *
      * @return a reference to the result vector, for chaining.
@@ -42,7 +42,8 @@ public interface IQuaternion
     Vector3 toAngles (Vector3 result);
 
     /**
-     * Computes and returns the angles to pass to {@link #fromAngles} to reproduce this rotation.
+     * Computes and returns the angles to pass to {@link Quaternion#fromAngles} to reproduce this
+     * rotation.
      *
      * @return a new vector containing the resulting angles.
      */
diff --git a/src/main/java/pythagoras/d/Matrix3.java b/src/main/java/pythagoras/d/Matrix3.java
index 153be0d..2a76f7a 100644
--- a/src/main/java/pythagoras/d/Matrix3.java
+++ b/src/main/java/pythagoras/d/Matrix3.java
@@ -471,7 +471,7 @@ public class Matrix3 implements IMatrix3, Serializable
     }
 
     /**
-     * @{@inheritDoc} This code is based on the examples in the
+     * {@inheritDoc} This code is based on the examples in the
      * <a href="http://www.j3d.org/matrix_faq/matrfaq_latest.html">Matrix and Quaternion FAQ</a>.
      */
     @Override // from IMatrix3
diff --git a/src/main/java/pythagoras/f/Box.java b/src/main/java/pythagoras/f/Box.java
index a4fd021..799285b 100644
--- a/src/main/java/pythagoras/f/Box.java
+++ b/src/main/java/pythagoras/f/Box.java
@@ -45,8 +45,8 @@ public class Box implements IBox, Serializable
     }
 
     /**
-     * Sets the parameters of the box to the empty values ({@link Vector3f#MAX_VALUE} and
-     * {@link Vector3f#MIN_VALUE} for the minimum and maximum, respectively).
+     * Sets the parameters of the box to the empty values ({@link Vector3#MAX_VALUE} and
+     * {@link Vector3#MIN_VALUE} for the minimum and maximum, respectively).
      *
      * @return a reference to this box, for chaining.
      */
diff --git a/src/main/java/pythagoras/f/IQuaternion.java b/src/main/java/pythagoras/f/IQuaternion.java
index a13b2a3..e0949be 100644
--- a/src/main/java/pythagoras/f/IQuaternion.java
+++ b/src/main/java/pythagoras/f/IQuaternion.java
@@ -32,9 +32,9 @@ public interface IQuaternion
     boolean hasNaN ();
 
     /**
-     * Computes the angles to pass to {@link #fromAngles} to reproduce this rotation, placing them
-     * in the provided vector. This uses the factorization method described in David Eberly's
-     * <a href="http://www.geometrictools.com/Documentation/EulerAngles.pdf">Euler Angle
+     * Computes the angles to pass to {@link Quaternion#fromAngles} to reproduce this rotation,
+     * placing them in the provided vector. This uses the factorization method described in David
+     * Eberly's <a href="http://www.geometrictools.com/Documentation/EulerAngles.pdf">Euler Angle
      * Formulas</a>.
      *
      * @return a reference to the result vector, for chaining.
@@ -42,7 +42,8 @@ public interface IQuaternion
     Vector3 toAngles (Vector3 result);
 
     /**
-     * Computes and returns the angles to pass to {@link #fromAngles} to reproduce this rotation.
+     * Computes and returns the angles to pass to {@link Quaternion#fromAngles} to reproduce this
+     * rotation.
      *
      * @return a new vector containing the resulting angles.
      */
diff --git a/src/main/java/pythagoras/f/Matrix3.java b/src/main/java/pythagoras/f/Matrix3.java
index 3a6c38b..aa3141f 100644
--- a/src/main/java/pythagoras/f/Matrix3.java
+++ b/src/main/java/pythagoras/f/Matrix3.java
@@ -471,7 +471,7 @@ public class Matrix3 implements IMatrix3, Serializable
     }
 
     /**
-     * @{@inheritDoc} This code is based on the examples in the
+     * {@inheritDoc} This code is based on the examples in the
      * <a href="http://www.j3d.org/matrix_faq/matrfaq_latest.html">Matrix and Quaternion FAQ</a>.
      */
     @Override // from IMatrix3