diff --git a/base/source/java/ch/systemsx/cisd/base/mdarray/MDByteArray.java b/base/source/java/ch/systemsx/cisd/base/mdarray/MDByteArray.java
index 0da289594d9f7a0c5af355417ab6ffd6e167d5b7..7c48d92b92593c2f7a28c876c6dd224397f5970b 100644
--- a/base/source/java/ch/systemsx/cisd/base/mdarray/MDByteArray.java
+++ b/base/source/java/ch/systemsx/cisd/base/mdarray/MDByteArray.java
@@ -48,7 +48,7 @@ public final class MDByteArray extends MDAbstractArray<Byte>
 
     /**
      * Creates a {@link MDByteArray} from the given <var>flattenedArray</var> and
-     * <var>dimensions</var>. If <var>checkDimensions/var>} is {@code true}, it is checked that the
+     * <var>dimensions</var>. If <var>checkDimensions</var> is {@code true}, it is checked that the
      * arguments are compatible. Convenience method if <var>dimensions</var> are available as
      * {@code long[]}.
      */
@@ -76,7 +76,7 @@ public final class MDByteArray extends MDAbstractArray<Byte>
 
     /**
      * Creates a {@link MDByteArray} from the given <var>flattenedArray</var> and
-     * <var>dimensions</var>. If <var>checkDimensions/var>} is {@code true}, it is checked that the
+     * <var>dimensions</var>. If <var>checkDimensions</var> is {@code true}, it is checked that the
      * arguments are compatible.
      */
     public MDByteArray(byte[] flattenedArray, int[] dimensions, boolean checkdimensions)
@@ -98,7 +98,7 @@ public final class MDByteArray extends MDAbstractArray<Byte>
 
     /**
      * Creates a {@link MDByteArray} from the given <var>matrix</var> of rank 2. Note that the
-     * values in <var>matrix</var> will be copied and thus the created {@link MDDoubleArray} will be
+     * values in <var>matrix</var> will be copied and thus the created {@link MDByteArray} will be
      * independent from <var>matrix</var> after construction.
      */
     public MDByteArray(byte[][] matrix)
@@ -110,7 +110,7 @@ public final class MDByteArray extends MDAbstractArray<Byte>
      * Creates a {@link MDByteArray} from the given <var>matrix</var> of rank 2 and the
      * <var>dimension</var> which need to be less or equal the dimensions of <var>matrix</var>. Note
      * that the values in <var>matrix</var> will be copied and thus the created
-     * {@link MDDoubleArray} will be independent from <var>matrix</var> after construction.
+     * {@link MDByteArray} will be independent from <var>matrix</var> after construction.
      */
     public MDByteArray(byte[][] matrix, int[] dimensions)
     {
diff --git a/base/source/java/ch/systemsx/cisd/base/mdarray/MDFloatArray.java b/base/source/java/ch/systemsx/cisd/base/mdarray/MDFloatArray.java
index e5eb557e42792e14a4822752cc11923e83b43a9b..e3f1f9269cd3203f3e154ea7acde3746057a1025 100644
--- a/base/source/java/ch/systemsx/cisd/base/mdarray/MDFloatArray.java
+++ b/base/source/java/ch/systemsx/cisd/base/mdarray/MDFloatArray.java
@@ -48,7 +48,7 @@ public final class MDFloatArray extends MDAbstractArray<Float>
 
     /**
      * Creates a {@link MDDoubleArray} from the given <var>flattenedArray</var> and
-     * <var>dimensions</var>. If <var>checkDimensions/var>} is {@code true}, it is checked that the
+     * <var>dimensions</var>. If <var>checkDimensions</var> is {@code true}, it is checked that the
      * arguments are compatible. Convenience method if <var>dimensions</var> are available as
      * {@code long[]}.
      */
@@ -76,7 +76,7 @@ public final class MDFloatArray extends MDAbstractArray<Float>
 
     /**
      * Creates a {@link MDDoubleArray} from the given <var>flattenedArray</var> and
-     * <var>dimensions</var>. If <var>checkDimensions/var>} is {@code true}, it is checked that the
+     * <var>dimensions</var>. If <var>checkDimensions</var> is {@code true}, it is checked that the
      * arguments are compatible.
      */
     public MDFloatArray(float[] flattenedArray, int[] dimensions, boolean checkdimensions)
@@ -98,7 +98,7 @@ public final class MDFloatArray extends MDAbstractArray<Float>
 
     /**
      * Creates a {@link MDFloatArray} from the given <var>matrix</var> of rank 2. Note that the
-     * values in <var>matrix</var> will be copied and thus the created {@link MDDoubleArray} will be
+     * values in <var>matrix</var> will be copied and thus the created {@link MDFloatArray} will be
      * independent from <var>matrix</var> after construction.
      */
     public MDFloatArray(float[][] matrix)
@@ -110,7 +110,7 @@ public final class MDFloatArray extends MDAbstractArray<Float>
      * Creates a {@link MDFloatArray} from the given <var>matrix</var> of rank 2 and the
      * <var>dimension</var> which need to be less or equal the dimensions of <var>matrix</var>. Note
      * that the values in <var>matrix</var> will be copied and thus the created
-     * {@link MDDoubleArray} will be independent from <var>matrix</var> after construction.
+     * {@link MDFloatArray} will be independent from <var>matrix</var> after construction.
      */
     public MDFloatArray(float[][] matrix, int[] dimensions)
     {
diff --git a/base/source/java/ch/systemsx/cisd/base/mdarray/MDIntArray.java b/base/source/java/ch/systemsx/cisd/base/mdarray/MDIntArray.java
index 9caf649431f769e037f49e5d609fb66866e77cf7..13cfcbf887a353f33ce592e6beeb68182bb76329 100644
--- a/base/source/java/ch/systemsx/cisd/base/mdarray/MDIntArray.java
+++ b/base/source/java/ch/systemsx/cisd/base/mdarray/MDIntArray.java
@@ -48,7 +48,7 @@ public final class MDIntArray extends MDAbstractArray<Integer>
 
     /**
      * Creates a {@link MDIntArray} from the given <var>flattenedArray</var> and
-     * <var>dimensions</var>. If <var>checkDimensions/var>} is {@code true}, it is checked that the
+     * <var>dimensions</var>. If <var>checkDimensions</var> is {@code true}, it is checked that the
      * arguments are compatible. Convenience method if <var>dimensions</var> are available as
      * {@code long[]}.
      */
@@ -76,7 +76,7 @@ public final class MDIntArray extends MDAbstractArray<Integer>
 
     /**
      * Creates a {@link MDIntArray} from the given <var>flattenedArray</var> and
-     * <var>dimensions</var>. If <var>checkDimensions/var>} is {@code true}, it is checked that the
+     * <var>dimensions</var>. If <var>checkDimensions</var> is {@code true}, it is checked that the
      * arguments are compatible.
      */
     public MDIntArray(int[] flattenedArray, int[] dimensions, boolean checkdimensions)
@@ -98,7 +98,7 @@ public final class MDIntArray extends MDAbstractArray<Integer>
 
     /**
      * Creates a {@link MDIntArray} from the given <var>matrix</var> of rank 2. Note that the
-     * values in <var>matrix</var> will be copied and thus the created {@link MDDoubleArray} will be
+     * values in <var>matrix</var> will be copied and thus the created {@link MDIntArray} will be
      * independent from <var>matrix</var> after construction.
      */
     public MDIntArray(int[][] matrix)
@@ -110,7 +110,7 @@ public final class MDIntArray extends MDAbstractArray<Integer>
      * Creates a {@link MDIntArray} from the given <var>matrix</var> of rank 2 and the
      * <var>dimension</var> which need to be less or equal the dimensions of <var>matrix</var>. Note
      * that the values in <var>matrix</var> will be copied and thus the created
-     * {@link MDDoubleArray} will be independent from <var>matrix</var> after construction.
+     * {@link MDIntArray} will be independent from <var>matrix</var> after construction.
      */
     public MDIntArray(int[][] matrix, int[] dimensions)
     {
diff --git a/base/source/java/ch/systemsx/cisd/base/mdarray/MDLongArray.java b/base/source/java/ch/systemsx/cisd/base/mdarray/MDLongArray.java
index 53c06f30ba608923cbf43bacf085da175ab7e450..a6bccc16abdc8e1863d77d4c95ef796df06b0992 100644
--- a/base/source/java/ch/systemsx/cisd/base/mdarray/MDLongArray.java
+++ b/base/source/java/ch/systemsx/cisd/base/mdarray/MDLongArray.java
@@ -48,7 +48,7 @@ public final class MDLongArray extends MDAbstractArray<Long>
 
     /**
      * Creates a {@link MDLongArray} from the given <var>flattenedArray</var> and
-     * <var>dimensions</var>. If <var>checkDimensions/var>} is {@code true}, it is checked that the
+     * <var>dimensions</var>. If <var>checkDimensions</var> is {@code true}, it is checked that the
      * arguments are compatible. Convenience method if <var>dimensions</var> are available as
      * {@code long[]}.
      */
@@ -76,7 +76,7 @@ public final class MDLongArray extends MDAbstractArray<Long>
 
     /**
      * Creates a {@link MDLongArray} from the given <var>flattenedArray</var> and
-     * <var>dimensions</var>. If <var>checkDimensions/var>} is {@code true}, it is checked that the
+     * <var>dimensions</var>. If <var>checkDimensions</var> is {@code true}, it is checked that the
      * arguments are compatible.
      */
     public MDLongArray(long[] flattenedArray, int[] dimensions, boolean checkdimensions)
@@ -98,7 +98,7 @@ public final class MDLongArray extends MDAbstractArray<Long>
 
     /**
      * Creates a {@link MDLongArray} from the given <var>matrix</var> of rank 2. Note that the
-     * values in <var>matrix</var> will be copied and thus the created {@link MDDoubleArray} will be
+     * values in <var>matrix</var> will be copied and thus the created {@link MDLongArray} will be
      * independent from <var>matrix</var> after construction.
      */
     public MDLongArray(long[][] matrix)
@@ -110,7 +110,7 @@ public final class MDLongArray extends MDAbstractArray<Long>
      * Creates a {@link MDLongArray} from the given <var>matrix</var> of rank 2 and the
      * <var>dimension</var> which need to be less or equal the dimensions of <var>matrix</var>. Note
      * that the values in <var>matrix</var> will be copied and thus the created
-     * {@link MDDoubleArray} will be independent from <var>matrix</var> after construction.
+     * {@link MDLongArray} will be independent from <var>matrix</var> after construction.
      */
     public MDLongArray(long[][] matrix, int[] dimensions)
     {
diff --git a/base/source/java/ch/systemsx/cisd/base/mdarray/MDShortArray.java b/base/source/java/ch/systemsx/cisd/base/mdarray/MDShortArray.java
index ecd50df0812ae3fa2fddc571c5c98c8f79f984ad..d8d2d85efba9adcf758c31a72aeda41bf87c7292 100644
--- a/base/source/java/ch/systemsx/cisd/base/mdarray/MDShortArray.java
+++ b/base/source/java/ch/systemsx/cisd/base/mdarray/MDShortArray.java
@@ -48,7 +48,7 @@ public final class MDShortArray extends MDAbstractArray<Short>
 
     /**
      * Creates a {@link MDShortArray} from the given <var>flattenedArray</var> and
-     * <var>dimensions</var>. If <var>checkDimensions/var>} is {@code true}, it is checked that the
+     * <var>dimensions</var>. If <var>checkDimensions</var> is {@code true}, it is checked that the
      * arguments are compatible. Convenience method if <var>dimensions</var> are available as
      * {@code long[]}.
      */
@@ -76,7 +76,7 @@ public final class MDShortArray extends MDAbstractArray<Short>
 
     /**
      * Creates a {@link MDShortArray} from the given <var>flattenedArray</var> and
-     * <var>dimensions</var>. If <var>checkDimensions/var>} is {@code true}, it is checked that the
+     * <var>dimensions</var>. If <var>checkDimensions</var> is {@code true}, it is checked that the
      * arguments are compatible.
      */
     public MDShortArray(short[] flattenedArray, int[] dimensions, boolean checkdimensions)
@@ -98,7 +98,7 @@ public final class MDShortArray extends MDAbstractArray<Short>
 
     /**
      * Creates a {@link MDShortArray} from the given <var>matrix</var> of rank 2. Note that the
-     * values in <var>matrix</var> will be copied and thus the created {@link MDDoubleArray} will be
+     * values in <var>matrix</var> will be copied and thus the created {@link MDShortArray} will be
      * independent from <var>matrix</var> after construction.
      */
     public MDShortArray(short[][] matrix)
@@ -110,7 +110,7 @@ public final class MDShortArray extends MDAbstractArray<Short>
      * Creates a {@link MDShortArray} from the given <var>matrix</var> of rank 2 and the
      * <var>dimension</var> which need to be less or equal the dimensions of <var>matrix</var>. Note
      * that the values in <var>matrix</var> will be copied and thus the created
-     * {@link MDDoubleArray} will be independent from <var>matrix</var> after construction.
+     * {@link MDShortArray} will be independent from <var>matrix</var> after construction.
      */
     public MDShortArray(short[][] matrix, int[] dimensions)
     {