diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToUUID.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToUUID.java
index 1a6c86d40..8fc6c8f90 100644
--- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToUUID.java
+++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToUUID.java
@@ -1,7 +1,6 @@
 package io.nosqlbench.virtdata.library.basics.shared.from_long.to_uuid;
 
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
-import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.Hash;
 
 import java.util.UUID;
 import java.util.function.LongFunction;
@@ -10,15 +9,6 @@ import java.util.function.LongFunction;
  * This function creates a non-random UUID in the type 4 version (Random).
  * It always puts the same value in the MSB position of the UUID format.
  * The input value is put in the LSB position.
- * <pre>
- * xxxxxxxx-xxxx-Mxxx-Nxxx-xxxxxxxxxxxx
- * mmmmmmmm-mmmm-Mmmm-Llll-llllllllllll
- *               4    3
- * </pre>
- * As shown above, the LSB position does not have the complication of having
- * a version identifier (position M) dividing the dynamic range of the data type.
- * For this reason, only the LSB side is used for this mapper, which allows
- * an effective range of Long.MAX_VALUE/8, given the loss of 3 digits of precision.
  *
  * This function is suitable for deterministic testing of scenarios which depend
  * on type 4 UUIDs, but without the mandated randomness that makes testing difficult.
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_epoch/DateTimeParser.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_epoch/DateTimeParser.java
index f7231b9ce..faa79bafe 100644
--- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_epoch/DateTimeParser.java
+++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_epoch/DateTimeParser.java
@@ -16,7 +16,7 @@ import java.util.function.Function;
  * date time, yielding a DateTime object.
  *
  * If no arguments are provided, then the format is set to
- * <pre>yyyy-MM-dd HH:mm:ss.SSSZ</pre>.
+ * "yyyy-MM-dd HH:mm:ss.SSSZ".
  *
  * For details on formatting options, see @see <a href="https://www.joda.org/joda-time/apidocs/org/joda/time/format/DateTimeFormat.html">DateTimeFormat</a>
  */
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveDouble.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveDouble.java
index 94cddf630..59956594e 100644
--- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveDouble.java
+++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveDouble.java
@@ -15,7 +15,7 @@ import java.util.function.Function;
  * name is fixed or a generated variable name from a provided function.
  * Note that the input type is not that suitable for constructing names,
  * so this is more likely to be used in an indirect naming pattern like
- * <pre>SaveDouble(Load('id'))</pre>
+ * SaveDouble(Load('id'))
  */
 @Categories(Category.state)
 @ThreadSafeMapper
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveFloat.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveFloat.java
index 93f4dc86a..555ec65ca 100644
--- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveFloat.java
+++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveFloat.java
@@ -15,7 +15,7 @@ import java.util.function.UnaryOperator;
  * name is fixed or a generated variable name from a provided function.
  * Note that the input type is not that suitable for constructing names,
  * so this is more likely to be used in an indirect naming pattern like
- * <pre>SaveDouble(Load('id'))</pre>
+ * SaveFloat(Load('id'))
  */
 @Categories(Category.state)
 @ThreadSafeMapper
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveInteger.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveInteger.java
index 9ee41f219..9a34cbb5c 100644
--- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveInteger.java
+++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveInteger.java
@@ -14,7 +14,7 @@ import java.util.function.IntUnaryOperator;
  * name is fixed or a generated variable name from a provided function.
  * Note that the input type is not that suitable for constructing names,
  * so this is more likely to be used in an indirect naming pattern like
- * <pre>SaveDouble(Load('id'))</pre>
+ * SaveInteger(Load('id'))
  */
 @Categories(Category.state)
 @ThreadSafeMapper
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveLong.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveLong.java
index 7da01641e..a5242c69e 100644
--- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveLong.java
+++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveLong.java
@@ -14,7 +14,7 @@ import java.util.function.LongUnaryOperator;
  * name is fixed or a generated variable name from a provided function.
  * Note that the input type is not that suitable for constructing names,
  * so this is more likely to be used in an indirect naming pattern like
- * <pre>SaveDouble(Load('id'))</pre>
+ * SaveLong(Load('id'))
  */
 @Categories(Category.state)
 @ThreadSafeMapper
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveString.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveString.java
index 4f3b78ba9..995142bf7 100644
--- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveString.java
+++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveString.java
@@ -14,7 +14,7 @@ import java.util.function.Function;
  * name is fixed or a generated variable name from a provided function.
  * Note that the input type is not that suitable for constructing names,
  * so this is more likely to be used in an indirect naming pattern like
- * <pre>SaveDouble(Load('id'))</pre>
+ * SaveString(Load('id'))
  */
 @Categories(Category.state)
 @ThreadSafeMapper
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveDouble.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveDouble.java
index 57b4d6577..acacc7efe 100644
--- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveDouble.java
+++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveDouble.java
@@ -15,7 +15,7 @@ import java.util.function.LongToDoubleFunction;
  * name is fixed or a generated variable name from a provided function.
  * Note that the input type is not that suitable for constructing names,
  * so this is more likely to be used in an indirect naming pattern like
- * <pre>SaveDouble(Load('id'))</pre>
+ * SaveDouble(Load('id'))
  */
 @Categories(Category.state)
 @ThreadSafeMapper
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveFloat.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveFloat.java
index 086916c55..51ee64aab 100644
--- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveFloat.java
+++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveFloat.java
@@ -14,7 +14,7 @@ import java.util.function.LongFunction;
  * name is fixed or a generated variable name from a provided function.
  * Note that the input type is not that suitable for constructing names,
  * so this is more likely to be used in an indirect naming pattern like
- * <pre>SaveDouble(Load('id'))</pre>
+ * SaveFloat(Load('id'))
  */
 @Categories(Category.state)
 @ThreadSafeMapper
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveInteger.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveInteger.java
index a9dc964fa..99883a0fb 100644
--- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveInteger.java
+++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveInteger.java
@@ -14,7 +14,7 @@ import java.util.function.LongToIntFunction;
  * name is fixed or a generated variable name from a provided function.
  * Note that the input type is not that suitable for constructing names,
  * so this is more likely to be used in an indirect naming pattern like
- * <pre>SaveDouble(Load('id'))</pre>
+ * SaveInteger(Load('id'))
  */
 @Categories(Category.state)
 @ThreadSafeMapper
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveLong.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveLong.java
index 248589bb7..b46bca16e 100644
--- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveLong.java
+++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveLong.java
@@ -14,7 +14,7 @@ import java.util.function.LongUnaryOperator;
  * name is fixed or a generated variable name from a provided function.
  * Note that the input type is not that suitable for constructing names,
  * so this is more likely to be used in an indirect naming pattern like
- * <pre>SaveDouble(Load('id'))</pre>
+ * SaveLong(Load('id'))
  */
 @Categories(Category.state)
 @ThreadSafeMapper
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveString.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveString.java
index f33bf2ea3..94b1ab800 100644
--- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveString.java
+++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveString.java
@@ -14,7 +14,7 @@ import java.util.function.LongFunction;
  * name is fixed or a generated variable name from a provided function.
  * Note that the input type is not that suitable for constructing names,
  * so this is more likely to be used in an indirect naming pattern like
- * <pre>SaveDouble(Load('id'))</pre>
+ * SaveString(Load('id'))
  */
 @Categories(Category.state)
 @ThreadSafeMapper