diff --git a/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/BindType.java b/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/BindType.java
index 14211366e..e25d1468d 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/BindType.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/BindType.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.engine.api.templating;
 
 /**
diff --git a/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/ObjectCache.java b/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/ObjectCache.java
index ba978afae..788a88d8b 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/ObjectCache.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/ObjectCache.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.engine.api.templating;
 
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/ParsedTemplateList.java b/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/ParsedTemplateList.java
index fe9838798..b622ddc37 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/ParsedTemplateList.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/ParsedTemplateList.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.engine.api.templating;
 
 import java.util.ArrayList;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/ParsedTemplateMap.java b/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/ParsedTemplateMap.java
index 1572de065..773504574 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/ParsedTemplateMap.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/ParsedTemplateMap.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.engine.api.templating;
 
 import io.nosqlbench.engine.api.templating.binders.ArrayBinder;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/Templatizer.java b/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/Templatizer.java
index 60fd3ef91..4bfe37e12 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/Templatizer.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/Templatizer.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.engine.api.templating;
 
 import io.nosqlbench.nb.api.errors.OpConfigError;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/TypeAndTarget.java b/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/TypeAndTarget.java
index b26bc0061..f289367f8 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/TypeAndTarget.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/TypeAndTarget.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.engine.api.templating;
 
 import java.util.function.LongFunction;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/ArrayBinder.java b/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/ArrayBinder.java
index afa010990..7751fe848 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/ArrayBinder.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/ArrayBinder.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.engine.api.templating.binders;
 
 import io.nosqlbench.engine.api.templating.ParsedTemplateMap;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/ListBinder.java b/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/ListBinder.java
index 9ce1d306b..544004de8 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/ListBinder.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/ListBinder.java
@@ -1,4 +1,20 @@
-    package io.nosqlbench.engine.api.templating.binders;
+    /*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.nosqlbench.engine.api.templating.binders;
 
 import io.nosqlbench.engine.api.templating.ParsedTemplateMap;
 import io.nosqlbench.nb.api.errors.OpConfigError;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/OrderedMapBinder.java b/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/OrderedMapBinder.java
index 241026933..3e63e5121 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/OrderedMapBinder.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/OrderedMapBinder.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.engine.api.templating.binders;
 
 import io.nosqlbench.engine.api.templating.ParsedTemplateMap;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Categories.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Categories.java
index a995d0ec3..7e4157a8a 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Categories.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Categories.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.api.annotations;
 
 import java.lang.annotation.ElementType;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Category.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Category.java
index 3102ab1c3..bbd1f48b7 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Category.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Category.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.api.annotations;
 
 public enum Category {
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/DeprecatedFunction.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/DeprecatedFunction.java
index 019a54453..369d86257 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/DeprecatedFunction.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/DeprecatedFunction.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.api.annotations;/*
 *   Copyright 2016 jshook
 *   Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Description.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Description.java
index 2c719e13b..efb117355 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Description.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Description.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.api.annotations;
 
 import java.lang.annotation.ElementType;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Example.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Example.java
index 4c36832d8..c5dcc3833 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Example.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Example.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.api.annotations;
 
 
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/ExampleData.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/ExampleData.java
index 9ab73c2b0..8b7408c03 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/ExampleData.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/ExampleData.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.api.annotations;
 
 import java.util.Arrays;
@@ -19,8 +35,8 @@ public class ExampleData {
 
     public static Pattern CTOR_PATTERN = Pattern.compile("(?<funcname>[^)]+)\\((?<args>.+)\\)");
     public static Pattern VALS_PATTERN = Pattern.compile("\\[(?<values>-?\\d+([,-. ]+-?\\d+)*)]");
-    private Pattern COMMA_VALS = Pattern.compile("\\[(?<vals>-?\\d+(,-?\\d+)*)]");
-    private Pattern RANGE_VALS = Pattern.compile("\\[(?<from>-?\\d+)\\.\\.(?<to>-?\\d+)( +(?<step>-?\\d+))?]");
+    private final Pattern COMMA_VALS = Pattern.compile("\\[(?<vals>-?\\d+(,-?\\d+)*)]");
+    private final Pattern RANGE_VALS = Pattern.compile("\\[(?<from>-?\\d+)\\.\\.(?<to>-?\\d+)( +(?<step>-?\\d+))?]");
 
     public String[] parts;
 
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Examples.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Examples.java
index 7394378e7..2de12960c 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Examples.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Examples.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.api.annotations;
 
 import java.lang.annotation.ElementType;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Input.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Input.java
index d45c6b54e..98343de65 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Input.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Input.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.api.annotations;/*
 *   Copyright 2016 jshook
 *   Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Output.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Output.java
index f2ddf33e2..b224b6be5 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Output.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Output.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.api.annotations;/*
 *   Copyright 2016 jshook
 *   Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/PerThreadMapper.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/PerThreadMapper.java
index cce4b2f38..8e82f1029 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/PerThreadMapper.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/PerThreadMapper.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.api.annotations;/*
 *   Copyright 2016 jshook
 *   Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Range.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Range.java
index c01663c61..e855c287e 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Range.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Range.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.api.annotations;
 
 public enum Range {
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/See.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/See.java
index 5a2fe8eff..7fc1637f8 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/See.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/See.java
@@ -1,17 +1,18 @@
 /*
-*   Copyright 2016 jshook
-*   Licensed under the Apache License, Version 2.0 (the "License");
-*   you may not use this file except in compliance with the License.
-*   You may obtain a copy of the License at
-*
-*       http://www.apache.org/licenses/LICENSE-2.0
-*
-*   Unless required by applicable law or agreed to in writing, software
-*   distributed under the License is distributed on an "AS IS" BASIS,
-*   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*   See the License for the specific language governing permissions and
-*   limitations under the License.
-*/
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 package io.nosqlbench.virtdata.api.annotations;
 
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/SeeList.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/SeeList.java
index 62d57df79..dabede1b7 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/SeeList.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/SeeList.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.api.annotations;
 
 import java.lang.annotation.ElementType;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/ThreadSafeMapper.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/ThreadSafeMapper.java
index 7e5e624e9..cb47a5c42 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/ThreadSafeMapper.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/ThreadSafeMapper.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.api.annotations;/*
 *   Copyright 2016 jshook
 *   Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/NBFunctionConverter.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/NBFunctionConverter.java
index 6dc8e167a..57dd0cc50 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/NBFunctionConverter.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/NBFunctionConverter.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.api.bindings;
 
 import java.nio.CharBuffer;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/VALUE.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/VALUE.java
index d6187daf9..2e600f70a 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/VALUE.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/VALUE.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.api.bindings;
 
 /**
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/VirtDataConversions.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/VirtDataConversions.java
index b4e1080b3..ef21f6ac9 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/VirtDataConversions.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/VirtDataConversions.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.api.bindings;
 
 import io.nosqlbench.nb.api.errors.BasicError;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/VirtDataFunctions.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/VirtDataFunctions.java
index ecc505fc9..d9203dae0 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/VirtDataFunctions.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/VirtDataFunctions.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.api.bindings;
 
 import io.nosqlbench.nb.api.errors.BasicError;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocCtorData.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocCtorData.java
index 073a33dd7..64b823223 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocCtorData.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocCtorData.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.api.processors;
 
 import java.util.List;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocForFunc.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocForFunc.java
index da67d24fc..ec4f0bc75 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocForFunc.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocForFunc.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.api.processors;
 
 import io.nosqlbench.virtdata.api.annotations.Category;
@@ -13,7 +29,7 @@ public class DocForFunc implements DocFuncData {
     private String classJavadoc;
     private String inType;
     private String outType;
-    private ArrayList<DocCtorData> ctors = new ArrayList<>();
+    private final ArrayList<DocCtorData> ctors = new ArrayList<>();
     private Category[] categories = new Category[] { };
 
     public void setPackageName(String packageName) {
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocForFuncCtor.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocForFuncCtor.java
index 2fb40ead4..d8d0ce7a9 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocForFuncCtor.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocForFuncCtor.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.api.processors;
 
 import io.nosqlbench.virtdata.api.annotations.ExampleData;
@@ -9,10 +25,10 @@ import java.util.Map;
 
 public class DocForFuncCtor implements DocCtorData {
 
-    private Map<String, String> args = new LinkedHashMap<>();
-    private String ctorDoc;
-    private String className;
-    private List<List<String>> examples = new ArrayList<>();
+    private final Map<String, String> args = new LinkedHashMap<>();
+    private final String ctorDoc;
+    private final String className;
+    private final List<List<String>> examples = new ArrayList<>();
 
     public DocForFuncCtor(String className, String ctorDoc, Map<String, String> args, List<List<String>> examples) {
         this.className = className;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocFuncData.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocFuncData.java
index 0ee0a2853..70fb70540 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocFuncData.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocFuncData.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.api.processors;
 
 import io.nosqlbench.virtdata.api.annotations.Category;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ExampleDocData.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ExampleDocData.java
index 27577e902..ace1ef6db 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ExampleDocData.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ExampleDocData.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.api.processors;
 
 import io.nosqlbench.virtdata.api.annotations.Category;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ExampleManifest.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ExampleManifest.java
index 18fd78b84..4e7bb76dc 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ExampleManifest.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ExampleManifest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.api.processors;
 
 import java.util.ArrayList;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FuncEnumerator.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FuncEnumerator.java
index e20763e5d..d6afd3a09 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FuncEnumerator.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FuncEnumerator.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.api.processors;
 
 import io.nosqlbench.virtdata.api.annotations.Category;
@@ -20,7 +36,7 @@ public class FuncEnumerator {
     private final Filer filer;
 
     private DocForFunc model;
-    private List<Listener> listeners = new ArrayList<>();
+    private final List<Listener> listeners = new ArrayList<>();
     private String anchorPackage;
     private String anchorSimpleName;
 
@@ -70,7 +86,7 @@ public class FuncEnumerator {
          * Handle each logical function model that has been found.
          * @param functionDoc the documentation model for a single mapping function
          */
-        public void onFunctionModel(DocForFunc functionDoc);
+        void onFunctionModel(DocForFunc functionDoc);
 
     }
 }
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionDocInfoProcessor.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionDocInfoProcessor.java
index 728972ccb..cedd66fa2 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionDocInfoProcessor.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionDocInfoProcessor.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.api.processors;
 //io.nosqlbench.virtdata.api.processors.FunctionDocInfoProcessor
 
@@ -33,7 +49,7 @@ public class FunctionDocInfoProcessor extends AbstractProcessor {
 
     public final static String AUTOSUFFIX = "AutoDocsInfo";
 
-    private static Pattern packageNamePattern = Pattern.compile("(?<packageName>.+)?\\.(?<className>.+)");
+    private static final Pattern packageNamePattern = Pattern.compile("(?<packageName>.+)?\\.(?<className>.+)");
     private Filer filer;
     private Map<String, String> options;
     private Elements elementUtils;
@@ -70,7 +86,7 @@ public class FunctionDocInfoProcessor extends AbstractProcessor {
         for (Element classElem : ts) {
 
             if (classElem.getKind() != ElementKind.CLASS) {
-                throw new RuntimeException("Unexpected kind of element: " + classElem.getKind() + " for " + classElem.toString());
+                throw new RuntimeException("Unexpected kind of element: " + classElem.getKind() + " for " + classElem);
             }
 
             // package and Class Name
@@ -165,7 +181,7 @@ public class FunctionDocInfoProcessor extends AbstractProcessor {
         return false;
     }
 
-    private static Pattern inheritDocPattern = Pattern.compile("(?ms)(?<pre>.*)(?<inherit>\\{@inheritDoc})(?<post>.*)$");
+    private static final Pattern inheritDocPattern = Pattern.compile("(?ms)(?<pre>.*)(?<inherit>\\{@inheritDoc})(?<post>.*)$");
     private String inheritDocs(String classDoc, Element classElem) {
         if (classDoc==null) {
             return null;
@@ -184,15 +200,15 @@ public class FunctionDocInfoProcessor extends AbstractProcessor {
 
 
         if (!inheritFromElement.isPresent()) {
-            messenger.printMessage(Diagnostic.Kind.ERROR, "Element " + classElem.toString() + " has '{@inheritDoc}', but a superclass was not found.");
-            return pre + "UNABLE TO FIND ELEMENT TO INHERIT DOCS FROM for " + classElem.toString() + " " + post;
+            messenger.printMessage(Diagnostic.Kind.ERROR, "Element " + classElem + " has '{@inheritDoc}', but a superclass was not found.");
+            return pre + "UNABLE TO FIND ELEMENT TO INHERIT DOCS FROM for " + classElem + " " + post;
         }
         TypeElement inheritFromType = inheritFromElement.get();
         String inheritedDocs = elementUtils.getDocComment(inheritFromType);
         if (inheritedDocs==null) {
-            messenger.printMessage(Diagnostic.Kind.ERROR, "javadocs are missing on " + inheritFromElement.toString() + ", but "
-            + classElem.toString() + " is trying to inherit docs from it.");
-            return pre + "UNABLE TO FIND INHERITED DOCS for " + classElem.toString() + " " + post;
+            messenger.printMessage(Diagnostic.Kind.ERROR, "javadocs are missing on " + inheritFromElement + ", but "
+            + classElem + " is trying to inherit docs from it.");
+            return pre + "UNABLE TO FIND INHERITED DOCS for " + classElem + " " + post;
         }
 
         if (inheritDocPattern.matcher(inheritedDocs).matches()) {
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionDocInfoWriter.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionDocInfoWriter.java
index 5b5e2deed..4c9c0e783 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionDocInfoWriter.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionDocInfoWriter.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.api.processors;
 
 import com.squareup.javapoet.*;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionManifestProcessor.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionManifestProcessor.java
index 318c16ce9..83c575667 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionManifestProcessor.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionManifestProcessor.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.api.processors;
 
 import javax.annotation.processing.*;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ProcessorClassNames.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ProcessorClassNames.java
index 0407f9c36..d951e68b7 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ProcessorClassNames.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ProcessorClassNames.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.api.processors;
 
 /**
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/Binder.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/Binder.java
index ba2f1e4b6..989a52f7c 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/Binder.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/Binder.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.bindings;
 
 import java.util.function.LongFunction;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/Bindings.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/Bindings.java
index 2e747dc8b..bc1f53d14 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/Bindings.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/Bindings.java
@@ -1,19 +1,17 @@
 /*
+ * Copyright (c) 2022 nosqlbench
  *
- *       Copyright 2015 Jonathan Shook
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package io.nosqlbench.virtdata.core.bindings;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/BindingsCache.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/BindingsCache.java
index 0747b2920..41270e1bc 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/BindingsCache.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/BindingsCache.java
@@ -1,17 +1,18 @@
 /*
-*   Copyright 2017 jshook
-*   Licensed under the Apache License, Version 2.0 (the "License");
-*   you may not use this file except in compliance with the License.
-*   You may obtain a copy of the License at
-*
-*       http://www.apache.org/licenses/LICENSE-2.0
-*
-*   Unless required by applicable law or agreed to in writing, software
-*   distributed under the License is distributed on an "AS IS" BASIS,
-*   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*   See the License for the specific language governing permissions and
-*   limitations under the License.
-*/
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package io.nosqlbench.virtdata.core.bindings;
 
 import java.util.HashMap;
@@ -20,7 +21,7 @@ import java.util.Map;
 public class BindingsCache {
 
     private final Bindings bindings;
-    private Map<String,Object> valuesCache = new HashMap<>();
+    private final Map<String,Object> valuesCache = new HashMap<>();
 
     public BindingsCache(Bindings bindings) {
         this.bindings = bindings;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/BindingsTemplate.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/BindingsTemplate.java
index d3c5f4843..7258eb070 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/BindingsTemplate.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/BindingsTemplate.java
@@ -1,19 +1,17 @@
 /*
+ * Copyright (c) 2022 nosqlbench
  *
- *       Copyright 2015 Jonathan Shook
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package io.nosqlbench.virtdata.core.bindings;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/CompatibilityFixups.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/CompatibilityFixups.java
index fe6521629..a1cc22a9a 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/CompatibilityFixups.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/CompatibilityFixups.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.bindings;
 
 import org.apache.logging.log4j.LogManager;
@@ -68,7 +84,7 @@ public class CompatibilityFixups {
         int start = 0;
 
         while (matcher.find()) {
-            out.append(spec.substring(start, matcher.start()));
+            out.append(spec, start, matcher.start());
             String replacement = fixCurveCall(matcher.group("name"), matcher.group("args"));
             out.append(replacement);
             start = matcher.end();
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualArrayBindings.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualArrayBindings.java
index 1e227934c..158e542cf 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualArrayBindings.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualArrayBindings.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.bindings;
 
 /**
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindings.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindings.java
index 7580242d0..bb094a19c 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindings.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindings.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.bindings;
 
 /**
@@ -13,8 +29,8 @@ package io.nosqlbench.virtdata.core.bindings;
 public class ContextualBindings<C, R> implements Binder<R> {
 
     private final C context;
-    private Bindings bindings;
-    private ValuesBinder<C, R> valuesBinder;
+    private final Bindings bindings;
+    private final ValuesBinder<C, R> valuesBinder;
 
     public ContextualBindings(Bindings bindings, C context, ValuesBinder<C, R> valuesBinder) {
         this.bindings = bindings;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindingsArrayTemplate.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindingsArrayTemplate.java
index b3691ae80..d3f518b56 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindingsArrayTemplate.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindingsArrayTemplate.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.bindings;
 
 /**
@@ -10,9 +26,9 @@ package io.nosqlbench.virtdata.core.bindings;
  */
 public class ContextualBindingsArrayTemplate<C, R> {
 
-    private C context;
-    private BindingsTemplate bindingsTemplate;
-    private ValuesArrayBinder<C, R> valuesArrayBinder;
+    private final C context;
+    private final BindingsTemplate bindingsTemplate;
+    private final ValuesArrayBinder<C, R> valuesArrayBinder;
 
     public ContextualBindingsArrayTemplate(C context,
                                            BindingsTemplate bindingsTemplate,
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindingsTemplate.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindingsTemplate.java
index dce75b82b..1118c02d7 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindingsTemplate.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindingsTemplate.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.bindings;
 
 /**
@@ -10,9 +26,9 @@ package io.nosqlbench.virtdata.core.bindings;
  */
 public class ContextualBindingsTemplate<C, R> {
 
-    private C context;
-    private BindingsTemplate bindingsTemplate;
-    private ValuesBinder<C, R> valuesBinder;
+    private final C context;
+    private final BindingsTemplate bindingsTemplate;
+    private final ValuesBinder<C, R> valuesBinder;
 
     public ContextualBindingsTemplate(C context,
                                       BindingsTemplate bindingsTemplate,
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualMapBindings.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualMapBindings.java
index f8d2d649e..ae7dd32f5 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualMapBindings.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualMapBindings.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.bindings;
 
 import java.util.HashMap;
@@ -16,8 +32,8 @@ import java.util.Map;
 public class ContextualMapBindings<C, R> implements Binder<R> {
 
     private final C context;
-    private Bindings bindings;
-    private ValuesMapBinder<C, R> valuesMapBinder;
+    private final Bindings bindings;
+    private final ValuesMapBinder<C, R> valuesMapBinder;
 
     public ContextualMapBindings(Bindings bindings, C context, ValuesMapBinder<C, R> valuesMapBinder) {
         this.bindings = bindings;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapper.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapper.java
index eb2275e0d..9d420b04a 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapper.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapper.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.bindings;
 
 import java.util.function.LongFunction;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperFunctionMapper.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperFunctionMapper.java
index eabb672aa..6e3daf00c 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperFunctionMapper.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperFunctionMapper.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.bindings;
 
 import java.util.function.*;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperLibrary.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperLibrary.java
index b58ed6e01..d0efac533 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperLibrary.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperLibrary.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.bindings;
 
 import java.util.List;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperLibraryFinder.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperLibraryFinder.java
index 1f5cd0bba..b4a0ebef7 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperLibraryFinder.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperLibraryFinder.java
@@ -1,17 +1,18 @@
 /*
-*   Copyright 2015 jshook
-*   Licensed under the Apache License, Version 2.0 (the "License");
-*   you may not use this file except in compliance with the License.
-*   You may obtain a copy of the License at
-*
-*       http://www.apache.org/licenses/LICENSE-2.0
-*
-*   Unless required by applicable law or agreed to in writing, software
-*   distributed under the License is distributed on an "AS IS" BASIS,
-*   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*   See the License for the specific language governing permissions and
-*   limitations under the License.
-*/
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package io.nosqlbench.virtdata.core.bindings;
 
 import org.apache.logging.log4j.Logger;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/FunctionType.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/FunctionType.java
index ac35a7e66..e605901ce 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/FunctionType.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/FunctionType.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.bindings;
 
 import java.util.function.*;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/FunctionTyper.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/FunctionTyper.java
index 52e47d9fd..45b883864 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/FunctionTyper.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/FunctionTyper.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.bindings;
 
 import java.lang.reflect.Method;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/LazyValuesMap.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/LazyValuesMap.java
index d418c3ef8..d0f808710 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/LazyValuesMap.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/LazyValuesMap.java
@@ -1,17 +1,18 @@
 /*
-*   Copyright 2017 jshook
-*   Licensed under the Apache License, Version 2.0 (the "License");
-*   you may not use this file except in compliance with the License.
-*   You may obtain a copy of the License at
-*
-*       http://www.apache.org/licenses/LICENSE-2.0
-*
-*   Unless required by applicable law or agreed to in writing, software
-*   distributed under the License is distributed on an "AS IS" BASIS,
-*   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*   See the License for the specific language governing permissions and
-*   limitations under the License.
-*/
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package io.nosqlbench.virtdata.core.bindings;
 
 import java.util.*;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ResolvedFunction.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ResolvedFunction.java
index 2d6d7661b..6e6ae990a 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ResolvedFunction.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ResolvedFunction.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.bindings;
 
 import java.lang.invoke.MethodHandles;
@@ -16,13 +32,13 @@ public class ResolvedFunction {
     public static Comparator<ResolvedFunction> PREFERRED_TYPE_COMPARATOR = new PreferredTypeComparator();
     private final Class<?> inputType;
     private final Class<?> outputType;
-    private Class<?>[] initializerSignature;
-    private Object[] initializerValues;
+    private final Class<?>[] initializerSignature;
+    private final Object[] initializerValues;
     private FunctionType functionType;
     private Object functionObject;
     private String libraryName;
-    private boolean isThreadSafe;
-    private static MethodHandles.Lookup methodLookup = MethodHandles.publicLookup();
+    private final boolean isThreadSafe;
+    private static final MethodHandles.Lookup methodLookup = MethodHandles.publicLookup();
 
 
     public ResolvedFunction(Object g, boolean isThreadSafe, Class<?>[] initializerSignature, Object[] initValues, Class<?> inputType, Class<?> outputType, String libraryName) {
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ResolverDiagnostics.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ResolverDiagnostics.java
index aebe96396..c52693428 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ResolverDiagnostics.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ResolverDiagnostics.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.bindings;
 
 import org.apache.logging.log4j.Logger;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/StringObjectPromoter.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/StringObjectPromoter.java
index 1866d406d..0e24045a4 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/StringObjectPromoter.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/StringObjectPromoter.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.bindings;
 
 import java.math.BigDecimal;
@@ -121,17 +137,13 @@ public class StringObjectPromoter {
         if (need.isAssignableFrom(have)) {
             return true;
         }
-        if (
-                (need == boolean.class && have == Boolean.class) ||
+        return (need == boolean.class && have == Boolean.class) ||
                 (need == byte.class && have == Byte.class) ||
                 (need == short.class && have == Short.class) ||
                 (need == char.class && have == Character.class) ||
                 (need == int.class && have == Integer.class) ||
                 (need == long.class && have == Long.class) ||
                 (need == float.class && have == Float.class) ||
-                (need == double.class && have == Double.class)) {
-            return true;
-        }
-        return false;
+                (need == double.class && have == Double.class);
     }
 }
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValueType.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValueType.java
index d7270701f..9326dab80 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValueType.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValueType.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.bindings;/*
 *   Copyright 2016 jshook
 *   Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValuesArrayBinder.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValuesArrayBinder.java
index b8038f61d..d12da1383 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValuesArrayBinder.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValuesArrayBinder.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.bindings;
 
 import io.nosqlbench.virtdata.core.templates.StringCompositor;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValuesBinder.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValuesBinder.java
index 1c06efb89..7780481d3 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValuesBinder.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValuesBinder.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.bindings;
 
 /**
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValuesMapBinder.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValuesMapBinder.java
index a67235b5e..ca1df0c8a 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValuesMapBinder.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValuesMapBinder.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.bindings;
 
 import java.util.Map;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtData.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtData.java
index 71ab565bb..622a7f30d 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtData.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtData.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.bindings;
 
 import io.nosqlbench.virtdata.lang.ast.VirtDataFlow;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataComposer.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataComposer.java
index cae6035ad..ca9be2135 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataComposer.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataComposer.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.bindings;
 
 import io.nosqlbench.virtdata.core.composers.FunctionAssembly;
@@ -160,7 +176,7 @@ public class VirtDataComposer {
             diagnostics.trace(summarize(resolved, "  - "));
 
             if (resolved.size()==0) {
-                return diagnostics.error(new RuntimeException("There were no functions found for " + call.toString()));
+                return diagnostics.error(new RuntimeException("There were no functions found for " + call));
             }
 
             funcs.addFirst(resolved);
@@ -177,7 +193,7 @@ public class VirtDataComposer {
         List<ResolvedFunction> flattenedFuncs = optimizePath(funcs, ValueType.classOfType(flow.getLastExpression().getCall().getOutputType()));
 
         if (flattenedFuncs.size() == 1) {
-            diagnostics.trace("FUNCTION resolution succeeded (single): '" + flow.toString() + "'");
+            diagnostics.trace("FUNCTION resolution succeeded (single): '" + flow + "'");
             return diagnostics.setResolvedFunction(flattenedFuncs.get(0));
         }
 
@@ -194,11 +210,11 @@ public class VirtDataComposer {
                 }
             } catch (Exception e) {
                 String flowdata = flow != null ? flow.toString() : "undefined";
-                return diagnostics.error(new RuntimeException("FUNCTION resolution failed: '" + flowdata + "': " + e.toString(),e));
+                return diagnostics.error(new RuntimeException("FUNCTION resolution failed: '" + flowdata + "': " + e,e));
             }
         }
         ResolvedFunction composedFunction = assembly.getResolvedFunction(isThreadSafe);
-        diagnostics.trace("FUNCTION resolution succeeded (lambda): '" + flow.toString() + "'");
+        diagnostics.trace("FUNCTION resolution succeeded (lambda): '" + flow + "'");
         return diagnostics.setResolvedFunction(composedFunction);
     }
 
@@ -225,7 +241,7 @@ public class VirtDataComposer {
             Object[] combination = new Object[allargs.length];
             int number = row;
             for (int pos = 0; pos < combination.length; pos++) {
-                int selector = (int) (number / modulos[pos]);
+                int selector = number / modulos[pos];
                 Object[] allargspos = allargs[pos];
                 Object objectatpos = allargspos[selector];
                 combination[pos] = objectatpos;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataDocs.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataDocs.java
index 0811984e3..813c76d8b 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataDocs.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataDocs.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.bindings;
 
 import io.nosqlbench.virtdata.api.processors.DocFuncData;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionFinder.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionFinder.java
index 12fbc54a9..1cb67e183 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionFinder.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionFinder.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.bindings;
 
 import io.nosqlbench.virtdata.api.processors.DocFuncData;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionLibrary.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionLibrary.java
index 034fe5216..4de18f2d9 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionLibrary.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionLibrary.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.bindings;
 
 import io.nosqlbench.virtdata.lang.ast.Expression;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionResolver.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionResolver.java
index 8807d8ea7..c27b8ad4d 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionResolver.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionResolver.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.bindings;
 
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataLibraries.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataLibraries.java
index c7063a178..3bc17c5a9 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataLibraries.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataLibraries.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.bindings;
 
 import org.apache.logging.log4j.Logger;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataLibrary.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataLibrary.java
index 15f997d17..d0b6e568e 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataLibrary.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataLibrary.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.bindings;
 
 import org.apache.logging.log4j.Logger;
@@ -5,7 +21,7 @@ import org.apache.logging.log4j.LogManager;
 
 public interface VirtDataLibrary {
 
-    final static Logger logger = LogManager.getLogger(VirtDataLibrary.class);
+    Logger logger = LogManager.getLogger(VirtDataLibrary.class);
 
     VirtDataFunctionLibrary getFunctionLibrary();
     String getLibname();
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleFunction.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleFunction.java
index 53f247469..afeba379f 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleFunction.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleFunction.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.composers;
 
 import io.nosqlbench.virtdata.core.bindings.FunctionType;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleToIntFunction.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleToIntFunction.java
index a9b1794bd..b9f524849 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleToIntFunction.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleToIntFunction.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.composers;
 
 import io.nosqlbench.virtdata.core.bindings.FunctionType;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleToLongFunction.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleToLongFunction.java
index 2050e17d9..70380535b 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleToLongFunction.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleToLongFunction.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.composers;
 
 import io.nosqlbench.virtdata.core.bindings.FunctionType;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleUnaryOperator.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleUnaryOperator.java
index e8c4914b6..367ee9274 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleUnaryOperator.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleUnaryOperator.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.composers;
 
 import io.nosqlbench.virtdata.core.bindings.FunctionType;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForFunction.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForFunction.java
index b699b080a..33c633c48 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForFunction.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForFunction.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.composers;
 
 import io.nosqlbench.virtdata.core.bindings.FunctionType;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntFunction.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntFunction.java
index 41198c0fe..f626b6dee 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntFunction.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntFunction.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.composers;
 
 import io.nosqlbench.virtdata.core.bindings.FunctionType;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntToDoubleFunction.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntToDoubleFunction.java
index 057028ba3..e515007a8 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntToDoubleFunction.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntToDoubleFunction.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.composers;
 
 import io.nosqlbench.virtdata.core.bindings.FunctionType;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntToLongFunction.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntToLongFunction.java
index 40c6c40f9..29d47058e 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntToLongFunction.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntToLongFunction.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.composers;
 
 import io.nosqlbench.virtdata.core.bindings.FunctionType;
@@ -5,7 +21,7 @@ import io.nosqlbench.virtdata.core.bindings.FunctionType;
 import java.util.function.*;
 
 public class ComposerForIntToLongFunction implements FunctionComposer<IntToLongFunction> {
-    private IntToLongFunction inner;
+    private final IntToLongFunction inner;
 
     public ComposerForIntToLongFunction(IntToLongFunction inner) {
         this.inner = inner;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntUnaryOperator.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntUnaryOperator.java
index 52c293b59..27023719f 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntUnaryOperator.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntUnaryOperator.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.composers;
 
 import io.nosqlbench.virtdata.core.bindings.FunctionType;
@@ -6,7 +22,7 @@ import java.util.function.*;
 
 public class ComposerForIntUnaryOperator implements FunctionComposer<IntUnaryOperator> {
 
-    private IntUnaryOperator inner;
+    private final IntUnaryOperator inner;
 
     public ComposerForIntUnaryOperator(IntUnaryOperator inner) {
         this.inner = inner;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongFunction.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongFunction.java
index a65bb168a..26fbec3d3 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongFunction.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongFunction.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.composers;
 
 import io.nosqlbench.virtdata.core.bindings.FunctionType;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongToDoubleFunction.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongToDoubleFunction.java
index b48b40905..a7f4464b3 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongToDoubleFunction.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongToDoubleFunction.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.composers;
 
 import io.nosqlbench.virtdata.core.bindings.FunctionType;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongToIntFunction.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongToIntFunction.java
index 8388cf52a..41c11a86f 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongToIntFunction.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongToIntFunction.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.composers;
 
 import io.nosqlbench.virtdata.core.bindings.FunctionType;
@@ -44,7 +60,7 @@ public class ComposerForLongToIntFunction implements FunctionComposer<LongToIntF
             case R_T:
                 final LongFunction<?> f5 =
                         (long l) ->
-                                ((Function<Integer,?>) outer).apply((int) inner.applyAsInt(l));
+                                ((Function<Integer,?>) outer).apply(inner.applyAsInt(l));
                 return new ComposerForLongFunction(f5);
             case int_int:
                 final LongToIntFunction f6 =
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongUnaryOperator.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongUnaryOperator.java
index 539f351ca..2431cc3c3 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongUnaryOperator.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongUnaryOperator.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.composers;
 
 import io.nosqlbench.virtdata.core.bindings.FunctionType;
@@ -6,7 +22,7 @@ import java.util.function.*;
 
 public class ComposerForLongUnaryOperator implements FunctionComposer<LongUnaryOperator> {
 
-    private LongUnaryOperator inner;
+    private final LongUnaryOperator inner;
 
     public ComposerForLongUnaryOperator(LongUnaryOperator inner) {
         this.inner = inner;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/FunctionAssembly.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/FunctionAssembly.java
index 785f24eba..de429861f 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/FunctionAssembly.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/FunctionAssembly.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.composers;
 
 import io.nosqlbench.virtdata.core.bindings.FunctionType;
@@ -31,9 +47,9 @@ public class FunctionAssembly implements FunctionComposer {
         } catch (Exception e) {
             logger.error("Error while composing functions:\n");
             if (composer != null) {
-                logger.error("composer: class:" + composer.getClass().getSimpleName() + ", toString:" + composer.toString());
+                logger.error("composer: class:" + composer.getClass().getSimpleName() + ", toString:" + composer);
             }
-            logger.error("outer: class:" + outer.getClass() + ", toString:" + outer.toString());
+            logger.error("outer: class:" + outer.getClass() + ", toString:" + outer);
             throw e;
         }
     }
@@ -73,7 +89,7 @@ public class FunctionAssembly implements FunctionComposer {
             }
         } catch (Exception e) {
             logger.error("Error while setting up initial composer state for function class:" +
-            o.getClass().getSimpleName() + ", toString:" + o.toString());
+            o.getClass().getSimpleName() + ", toString:" + o);
             throw e;
         }
     }
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/FunctionComposer.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/FunctionComposer.java
index f2a02f175..d9adb2278 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/FunctionComposer.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/FunctionComposer.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.composers;
 
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/BindPoint.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/BindPoint.java
index 1d1601fb6..7a838ff52 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/BindPoint.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/BindPoint.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.templates;
 
 import java.util.Objects;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/BindPointParser.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/BindPointParser.java
index 9e3706564..e57255ef0 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/BindPointParser.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/BindPointParser.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.templates;
 
 import io.nosqlbench.nb.api.errors.BasicError;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CSVBindings.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CSVBindings.java
index 8313b12d6..ddd0396c1 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CSVBindings.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CSVBindings.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.templates;
 
 import io.nosqlbench.virtdata.core.bindings.Binder;
@@ -5,7 +21,7 @@ import io.nosqlbench.virtdata.core.bindings.Bindings;
 
 public class CSVBindings implements Binder<String> {
 
-    private Bindings bindings;
+    private final Bindings bindings;
     private int bufferlen=0;
 
     public CSVBindings(Bindings bindings) {
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CSVBindingsTemplate.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CSVBindingsTemplate.java
index 0de65d3b8..eab974b04 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CSVBindingsTemplate.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CSVBindingsTemplate.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.templates;
 
 import io.nosqlbench.virtdata.core.bindings.Bindings;
@@ -5,7 +21,7 @@ import io.nosqlbench.virtdata.core.bindings.BindingsTemplate;
 
 public class CSVBindingsTemplate {
 
-    private BindingsTemplate bindingsTemplate;
+    private final BindingsTemplate bindingsTemplate;
 
     public CSVBindingsTemplate(BindingsTemplate bindingsTemplate) {
         this.bindingsTemplate = bindingsTemplate;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CapturePoint.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CapturePoint.java
index e0d920015..2efa13710 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CapturePoint.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CapturePoint.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.templates;
 
 import java.util.Objects;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CapturePointParser.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CapturePointParser.java
index b5710d209..e51fdf2f7 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CapturePointParser.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CapturePointParser.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.templates;
 
 import java.util.ArrayList;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/ParsedTemplate.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/ParsedTemplate.java
index ceede5529..b54aef7bd 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/ParsedTemplate.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/ParsedTemplate.java
@@ -1,18 +1,17 @@
 /*
+ * Copyright (c) 2022 nosqlbench
  *
- *    Copyright 2016 jshook
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *        http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * /
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package io.nosqlbench.virtdata.core.templates;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/StringBindings.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/StringBindings.java
index cf6c039a7..008e4c496 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/StringBindings.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/StringBindings.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.templates;
 
 import io.nosqlbench.virtdata.core.bindings.Binder;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/StringBindingsTemplate.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/StringBindingsTemplate.java
index 151b52950..2e09e6455 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/StringBindingsTemplate.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/StringBindingsTemplate.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.templates;
 
 //import io.nosqlbench.engine.api.activityconfig.ParsedStmt;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/StringCompositor.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/StringCompositor.java
index b3092e04f..d51c9874e 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/StringCompositor.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/StringCompositor.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.templates;
 
 import io.nosqlbench.virtdata.core.bindings.DataMapper;
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/StringMapCompositor.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/StringMapCompositor.java
index 5715fd9ac..5124f684f 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/StringMapCompositor.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/StringMapCompositor.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.templates;
 
 import io.nosqlbench.virtdata.core.bindings.ValuesArrayBinder;
@@ -21,8 +37,8 @@ import java.util.regex.Pattern;
 public class StringMapCompositor implements ValuesArrayBinder<StringMapCompositor, String> {
 
 //    private static Pattern tokenPattern = Pattern.compile("(?<!\\\\)\\{([^}]*)\\}(.*?)?",Pattern.DOTALL);
-    private static Pattern tokenPattern = Pattern.compile("(?<section>(?<literal>[^{}]+)?(?<anchor>\\{(?<token>[a-zA-Z.-]+)?\\})?)");
-    private String[] templateSegments;
+    private static final Pattern tokenPattern = Pattern.compile("(?<section>(?<literal>[^{}]+)?(?<anchor>\\{(?<token>[a-zA-Z.-]+)?\\})?)");
+    private final String[] templateSegments;
     private int buffersize=0;
 
     /**
diff --git a/virtdata-api/src/test/java/io/nosqlbench/engine/api/templating/ParsedTemplateListTest.java b/virtdata-api/src/test/java/io/nosqlbench/engine/api/templating/ParsedTemplateListTest.java
index 73e8fca42..7eacaaa23 100644
--- a/virtdata-api/src/test/java/io/nosqlbench/engine/api/templating/ParsedTemplateListTest.java
+++ b/virtdata-api/src/test/java/io/nosqlbench/engine/api/templating/ParsedTemplateListTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.engine.api.templating;
 
 import org.junit.jupiter.api.Test;
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/annotations/ExampleDataTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/annotations/ExampleDataTest.java
index abbc849e6..4f792f7a1 100644
--- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/annotations/ExampleDataTest.java
+++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/annotations/ExampleDataTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.annotations;
 
 import io.nosqlbench.virtdata.api.annotations.ExampleData;
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/api/bindings/VirtDataConversionsTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/api/bindings/VirtDataConversionsTest.java
index fa1701170..ca45a53b2 100644
--- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/api/bindings/VirtDataConversionsTest.java
+++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/api/bindings/VirtDataConversionsTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.api.bindings;
 
 import org.junit.jupiter.api.Test;
@@ -128,4 +144,4 @@ public class VirtDataConversionsTest {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/CompatibilityFixupsTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/CompatibilityFixupsTest.java
index 051e29f36..226bd2ffa 100644
--- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/CompatibilityFixupsTest.java
+++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/CompatibilityFixupsTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core;
 
 import io.nosqlbench.virtdata.core.bindings.CompatibilityFixups;
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/ResolvedFunctionTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/ResolvedFunctionTest.java
index 584e107c9..bd1c50f80 100644
--- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/ResolvedFunctionTest.java
+++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/ResolvedFunctionTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core;
 
 import io.nosqlbench.virtdata.core.bindings.ResolvedFunction;
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/VirtDataComposerTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/VirtDataComposerTest.java
index 2a39156b7..d082c8a1e 100644
--- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/VirtDataComposerTest.java
+++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/VirtDataComposerTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core;
 
 import io.nosqlbench.virtdata.core.bindings.ResolverDiagnostics;
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/VirtDataTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/VirtDataTest.java
index 35fa66a29..897665e9c 100644
--- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/VirtDataTest.java
+++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/VirtDataTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core;
 
 import io.nosqlbench.virtdata.core.bindings.BindingsTemplate;
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/composers/FunctionAssemblerMatrixTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/composers/FunctionAssemblerMatrixTest.java
index 4815c10de..5d1cc16ce 100644
--- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/composers/FunctionAssemblerMatrixTest.java
+++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/composers/FunctionAssemblerMatrixTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.composers;
 
 import io.nosqlbench.virtdata.core.bindings.DataMapper;
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/composers/FunctionAssemblerTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/composers/FunctionAssemblerTest.java
index 97ce18b48..ab686ed9a 100644
--- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/composers/FunctionAssemblerTest.java
+++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/composers/FunctionAssemblerTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.composers;
 
 import io.nosqlbench.virtdata.core.bindings.DataMapper;
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/config/ConfigDataTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/config/ConfigDataTest.java
index b6812532c..dae253ce0 100644
--- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/config/ConfigDataTest.java
+++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/config/ConfigDataTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.config;
 
 import io.nosqlbench.nb.api.config.standard.ConfigData;
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/BindPointParserTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/BindPointParserTest.java
index 66d0152b0..634ce423c 100644
--- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/BindPointParserTest.java
+++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/BindPointParserTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.templates;
 
 import org.junit.jupiter.api.Test;
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/CapturePointTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/CapturePointTest.java
index 247120eb3..ee4538acf 100644
--- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/CapturePointTest.java
+++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/CapturePointTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.templates;
 
 import org.junit.jupiter.api.Test;
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/FastStringCompositorTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/FastStringCompositorTest.java
index 3857d111d..0f2b185db 100644
--- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/FastStringCompositorTest.java
+++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/FastStringCompositorTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.templates;
 
 import org.junit.jupiter.api.Disabled;
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/ParsedTemplateTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/ParsedTemplateTest.java
index 953d851c6..5cfcd12a9 100644
--- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/ParsedTemplateTest.java
+++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/ParsedTemplateTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.templates;
 
 import io.nosqlbench.engine.api.templating.BindType;
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/StringBindingsTemplateTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/StringBindingsTemplateTest.java
index 65014407d..465fb483b 100644
--- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/StringBindingsTemplateTest.java
+++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/StringBindingsTemplateTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.templates;
 
 import io.nosqlbench.virtdata.core.bindings.BindingsTemplate;
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/StringCompositorTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/StringCompositorTest.java
index 85ed84efb..1065b503c 100644
--- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/StringCompositorTest.java
+++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/StringCompositorTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.templates;
 
 import org.junit.jupiter.api.Test;
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/TestIdentity.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/TestIdentity.java
index 9e924c364..e35a2c8d7 100644
--- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/TestIdentity.java
+++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/TestIdentity.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.templates;
 
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/TestValue.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/TestValue.java
index 8ffc98f59..308a9e643 100644
--- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/TestValue.java
+++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/TestValue.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.templates;
 
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/ValueTypeTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/ValueTypeTest.java
index e1bd9952b..bb521802b 100644
--- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/ValueTypeTest.java
+++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/ValueTypeTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.core.templates;
 
 import io.nosqlbench.virtdata.core.bindings.ValueType;
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplate.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplate.java
index 24dfdeb64..5ce062944 100644
--- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplate.java
+++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplate.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.testmappers;
 
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplateTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplateTest.java
index bc63317a6..82054510d 100644
--- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplateTest.java
+++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplateTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.testmappers;
 
 import org.junit.jupiter.api.Test;
@@ -13,4 +29,4 @@ public class TestableTemplateTest {
         assertThat(v).isEqualTo("3,3");
     }
 
-}
\ No newline at end of file
+}
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestingRepeater.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestingRepeater.java
index 45e4cbcde..e6964bbc9 100644
--- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestingRepeater.java
+++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestingRepeater.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.testmappers;
 
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/util/StringObjectPromoterTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/util/StringObjectPromoterTest.java
index 3f86a20b4..05887d9a0 100644
--- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/util/StringObjectPromoterTest.java
+++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/util/StringObjectPromoterTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.util;
 
 import io.nosqlbench.virtdata.core.bindings.StringObjectPromoter;
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/util/VirtDataFunctionsTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/util/VirtDataFunctionsTest.java
index 8603a3067..3570f9adb 100644
--- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/util/VirtDataFunctionsTest.java
+++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/util/VirtDataFunctionsTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2022 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.nosqlbench.virtdata.util;
 
 import io.nosqlbench.virtdata.api.bindings.VirtDataFunctions;