--- old/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template	2019-07-10 11:14:27.572065400 -0700
+++ new/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template	2019-07-10 11:14:26.969776800 -0700
@@ -524,7 +524,7 @@
      *         if the given {@code long} value cannot
      *         be represented by the vector's {@code ETYPE}
      * @see #broadcast(VectorSpecies,$type$)
-     * @see VectorSpecies#checkValue(VectorSpecies,$type$)
+     * @see VectorSpecies#checkValue(VectorSpecies,long)
      */
     public static $abstractvectortype$ broadcast(VectorSpecies<$Boxtype$> species, long e) {
         $Type$Species vsp = ($Type$Species) species;
@@ -1522,7 +1522,6 @@
     }
 
     /**
-    /**
      * {@inheritDoc} <!--workaround-->
      * @see #div($type$,VectorMask)
 #if[FP]
@@ -1894,7 +1893,7 @@
      * @return the bitwise complement {@code ~} of this vector
      * @see #and(Vector)
      * @see VectorOperators#NOT
-     * @see #lanewise(VectorOperators.Unary,Vector,VectorMask)
+     * @see #lanewise(VectorOperators.Unary,VectorMask)
      */
     @ForceInline
     public final $abstractvectortype$ not() {
@@ -2058,7 +2057,7 @@
      *         comparison operator
      * @see $abstractvectortype$#compare(VectorOperators.Comparison,Vector)
      * @see #eq($type$)
-     * @see #lessThan($type$)
+     * @see #lt($type$)
      */
     public abstract
     VectorMask<$Boxtype$> compare(Comparison op, $type$ e);
@@ -3106,7 +3105,8 @@
      * @throws IndexOutOfBoundsException
      *         if {@code offset+N*ESIZE < 0}
      *         or {@code offset+(N+1)*ESIZE > a.length}
-     *         for any lane {@code N} in the vector
+     *         for any lane {@code N} in the vector where
+     *         the mask is set
      */
     @ForceInline
     public static
@@ -3364,7 +3364,7 @@
 #end[!byte]
      * @throws IndexOutOfBoundsException
      *         if {@code offset+N*$sizeInBytes$ < 0}
-     *         or {@code offset+N**$sizeInBytes$ >= bb.limit()}
+     *         or {@code offset+N*$sizeInBytes$ >= bb.limit()}
      *         for any lane {@code N} in the vector
      */
     @ForceInline
@@ -3414,7 +3414,7 @@
 #end[!byte]
      * @throws IndexOutOfBoundsException
      *         if {@code offset+N*$sizeInBytes$ < 0}
-     *         or {@code offset+N**$sizeInBytes$ >= bb.limit()}
+     *         or {@code offset+N*$sizeInBytes$ >= bb.limit()}
      *         for any lane {@code N} in the vector
      *         where the mask is set
      */