diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocCat.java b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocCat.java
index 0f8e151a5..57430afb3 100644
--- a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocCat.java
+++ b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocCat.java
@@ -30,6 +30,6 @@ public class FDocCat implements Iterable<FDocFuncs> {
     public Iterator<FDocFuncs> iterator() {
         ArrayList<FDocFuncs> fdocs = new ArrayList<>(docsByFuncName.values());
         fdocs.sort(Comparator.comparing(FDocFuncs::getFunctionName));
-        return docsByFuncName.values().iterator();
+        return fdocs.iterator();
     }
 }
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocFuncs.java b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocFuncs.java
index dc12eafc0..4a3474a99 100644
--- a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocFuncs.java
+++ b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocFuncs.java
@@ -71,4 +71,12 @@ public class FDocFuncs implements Iterable<FDocFunc> {
             .replaceAll("java.net.","")
             .replaceAll("java.io.","");
     }
+
+    @Override
+    public String toString() {
+        return "FDocFuncs{" +
+                "functionsByPackage=" + functionsByPackage +
+                ", functionName='" + functionName + '\'' +
+                '}';
+    }
 }