Merge from dev of tools changes

81 files changed, 5869 insertions, 5826 deletions

diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index 945444a..15da7d3 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -29,7 +29,7 @@
 H5_ATTR_PURE int
 print_objname (diff_opt_t * opts, hsize_t nfound)
 {
-    return ((opts->m_verbose || nfound) && !opts->m_quiet) ? 1 : 0;
+    return ((opts->mode_verbose || nfound) && !opts->mode_quiet) ? 1 : 0;
 }
 
 /*-------------------------------------------------------------------------
@@ -45,7 +45,7 @@ do_print_objname (const char *OBJ, const char *path1, const char *path2, diff_op
      * displaying any object or symbolic links. This improves
      * readability of the output.
      */
-    if (opts->m_verbose_level >= 1)
+    if (opts->mode_verbose_level >= 1)
         parallel_print("\n");
     parallel_print("%-7s: <%s> and <%s>\n", OBJ, path1, path2);
 }
@@ -74,7 +74,7 @@ do_print_attrname (const char *attr, const char *path1, const char *path2)
 static int
 print_warn(diff_opt_t *opts)
 {
-    return ((opts->m_verbose)) ? 1: 0;
+    return ((opts->mode_verbose)) ? 1: 0;
 }
 
 
@@ -141,7 +141,7 @@ is_valid_options(diff_opt_t *opts)
 
     /*-----------------------------------------------
      * no -q(quiet) with -v (verbose) or -r (report) */
-    if(opts->m_quiet && (opts->m_verbose || opts->m_report)) {
+    if(opts->mode_quiet && (opts->mode_verbose || opts->mode_report)) {
         parallel_print("Error: -q (quiet mode) cannot be added to verbose or report modes\n");
         opts->err_stat = H5DIFF_ERR;
         H5TOOLS_GOTO_DONE(0);
@@ -169,9 +169,9 @@ done:
  *           0 - not excluded path
  *------------------------------------------------------------------------*/
 static int
-is_exclude_path (char * path, h5trav_type_t type, diff_opt_t *opts)
+is_exclude_path (char *path, h5trav_type_t type, diff_opt_t *opts)
 {
-    struct exclude_path_list * exclude_path_ptr;
+    struct exclude_path_list *exclude_path_ptr;
     int   ret_cmp;
     int   ret_value = 0;
 
@@ -210,7 +210,7 @@ is_exclude_path (char * path, h5trav_type_t type, diff_opt_t *opts)
             if (ret_cmp == 0) {  /* found matching object */
                 /* excluded non-group object */
                 ret_value = 1;
-                /* remember the type of this maching object.
+                /* remember the type of this matching object.
                  * if it's group, it can be used for excluding its member
                  * objects in this while() loop */
                 exclude_path_ptr->obj_type = type;
@@ -224,6 +224,71 @@ done:
     return  ret_value;
 }
 
+/*-------------------------------------------------------------------------
+ * Function: is_exclude_attr
+ *
+ * Purpose:  check if 'paths' are part of exclude path list
+ *
+ * Return:
+ *           1 - excluded path
+ *           0 - not excluded path
+ *------------------------------------------------------------------------*/
+static int
+is_exclude_attr (char *path, h5trav_type_t type, diff_opt_t *opts)
+{
+    struct exclude_path_list *exclude_ptr;
+    int   ret_cmp;
+    int   ret_value = 0;
+
+    /* check if exclude attr option is given */
+    if (!opts->exclude_attr_path)
+        H5TOOLS_GOTO_DONE(0);
+
+    /* assign to local exclude list pointer */
+    exclude_ptr = opts->exclude_attr;
+
+    /* search objects in exclude list */
+    while (NULL != exclude_ptr) {
+        /* if exclude path is is group, exclude its members as well */
+        if (exclude_ptr->obj_type == H5TRAV_TYPE_GROUP) {
+            ret_cmp = HDstrncmp(exclude_ptr->obj_path, path,
+                                HDstrlen(exclude_ptr->obj_path));
+            if (ret_cmp == 0) {  /* found matching members */
+                size_t len_grp;
+
+                /* check if given path belong to an excluding group, if so
+                 * exclude it as well.
+                 * This verifies if “/grp1/dset1” is only under “/grp1”, but
+                 * not under “/grp1xxx/” group.
+                 */
+                len_grp = HDstrlen(exclude_ptr->obj_path);
+                if (path[len_grp] == '/') {
+                    /* belong to excluded group! */
+                    ret_value = 1;
+                    break;  /* while */
+                }
+            }
+        }
+        /* exclude target is not group, just exclude the object */
+        else {
+            ret_cmp = HDstrcmp(exclude_ptr->obj_path, path);
+            if (ret_cmp == 0) {  /* found matching object */
+                /* excluded non-group object */
+                ret_value = 1;
+                /* remember the type of this matching object.
+                 * if it's group, it can be used for excluding its member
+                 * objects in this while() loop */
+                exclude_ptr->obj_type = type;
+                break; /* while */
+            }
+        }
+        exclude_ptr = exclude_ptr->next;
+    }
+
+done:
+    return  ret_value;
+}
+
 
 /*-------------------------------------------------------------------------
  * Function: free_exclude_path_list
@@ -243,6 +308,25 @@ free_exclude_path_list(diff_opt_t *opts)
     }
 }
 
+
+/*-------------------------------------------------------------------------
+ * Function: free_exclude_attr_list
+ *
+ * Purpose:  free exclude object attribute list from diff options
+ *------------------------------------------------------------------------*/
+static void
+free_exclude_attr_list(diff_opt_t *opts)
+{
+    struct exclude_path_list *curr = opts->exclude_attr;
+    struct exclude_path_list *next;
+
+    while (NULL != curr) {
+        next = curr->next;
+        HDfree(curr);
+        curr = next;
+    }
+}
+
 /*-------------------------------------------------------------------------
  * Function: build_match_list
  *
@@ -288,6 +372,7 @@ build_match_list (const char *objname1, trav_info_t *info1, const char *objname2
      * All the objects belong to given groups are the candidates.
      * So prepare to compare paths without the group names.
      */
+    H5TOOLS_DEBUG("objname1 = %s objname2 = %s ", objname1, objname2);
 
     /* if obj1 is not root */
     if (HDstrcmp (objname1,"/") != 0)
@@ -421,8 +506,8 @@ trav_grp_symlinks(const char *path, const H5L_info_t *linfo, void *udata)
                 H5TOOLS_GOTO_DONE(FAIL);
             }
             else if (ret_value == 0) {
-             /* no dangling link option given and detect dangling link */
-               tinfo->symlink_visited.dangle_link = TRUE;
+                /* no dangling link option given and detect dangling link */
+                tinfo->symlink_visited.dangle_link = TRUE;
                 trav_info_visit_lnk(path, linfo, tinfo);
                 if (opts->no_dangle_links)
                     opts->err_stat = H5DIFF_ERR; /* make dangling link is error */
@@ -560,17 +645,17 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char
     *-------------------------------------------------------------------------
     */
     /* open file 1 */
-    if((file1_id = h5tools_fopen(fname1, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, (size_t)0)) < 0) {
+    if((file1_id = h5tools_fopen(fname1, H5F_ACC_RDONLY, H5P_DEFAULT, FALSE, NULL, (size_t)0)) < 0) {
         parallel_print("h5diff: <%s>: unable to open file\n", fname1);
         H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "<%s>: unable to open file\n", fname1);
-    } /* end if */
+    }
     H5TOOLS_DEBUG("file1_id = %s", fname1);
 
     /* open file 2 */
-    if((file2_id = h5tools_fopen(fname2, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, (size_t)0)) < 0) {
+    if((file2_id = h5tools_fopen(fname2, H5F_ACC_RDONLY, H5P_DEFAULT, FALSE, NULL, (size_t)0)) < 0) {
         parallel_print("h5diff: <%s>: unable to open file\n", fname2);
         H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "<%s>: unable to open file\n", fname2);
-    } /* end if */
+    }
     H5TOOLS_DEBUG("file2_id = %s", fname2);
 
     /*-------------------------------------------------------------------------
@@ -600,6 +685,7 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char
         }
         else
             obj1fullname = HDstrdup(objname1);
+        H5TOOLS_DEBUG("obj1fullname = %s", obj1fullname);
 
         /* make the given object2 fullpath, start with "/" */
         if (HDstrncmp(objname2, "/", 1)) {
@@ -617,6 +703,7 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char
         }
         else
             obj2fullname = HDstrdup(objname2);
+        H5TOOLS_DEBUG("obj2fullname = %s", obj2fullname);
 
         /*----------------------------------------------------------
          * check if obj1 is root, group, single object or symlink
@@ -750,12 +837,12 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char
             H5TOOLS_DEBUG("h5diff ... dangling link");
             if (opts->no_dangle_links) {
                 /* treat dangling link as error */
-                if(opts->m_verbose)
+                if(opts->mode_verbose)
                     parallel_print("Warning: <%s> is a dangling link.\n", obj1fullname);
                 H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "treat dangling link as error");
             }
             else {
-                if(opts->m_verbose)
+                if(opts->mode_verbose)
                     parallel_print("obj1 <%s> is a dangling link.\n", obj1fullname);
                 if (l_ret1 != 0 ||  l_ret2 != 0) {
                     nfound++;
@@ -791,12 +878,12 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char
             H5TOOLS_DEBUG("h5diff ... dangling link");
             if (opts->no_dangle_links) {
                 /* treat dangling link as error */
-                if(opts->m_verbose)
+                if(opts->mode_verbose)
                     parallel_print("Warning: <%s> is a dangling link.\n", obj2fullname);
                 H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "treat dangling link as error");
             }
             else {
-                if(opts->m_verbose)
+                if(opts->mode_verbose)
                     parallel_print("obj2 <%s> is a dangling link.\n", obj2fullname);
                 if (l_ret1 != 0 || l_ret2 != 0) {
                     nfound++;
@@ -830,8 +917,8 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char
     * comparing details of same objects.
     */
 
-    if(!(opts->m_verbose || opts->m_report)) {
-        H5TOOLS_DEBUG("h5diff NOT (opts->m_verbose || opts->m_report)");
+    if(!(opts->mode_verbose || opts->mode_report)) {
+        H5TOOLS_DEBUG("h5diff NOT (opts->mode_verbose || opts->mode_report)");
         /* if no danglink links */
         if (l_ret1 > 0 && l_ret2 > 0)
             if (h5tools_is_obj_same(file1_id, obj1fullname, file2_id, obj2fullname) != 0)
@@ -897,9 +984,14 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char
         /*------------------------------------------------------
          * print the list
          */
-         if(opts->m_verbose) {
+         if(opts->mode_verbose) {
              unsigned u;
 
+             if(opts->mode_verbose_level > 2) {
+                parallel_print("file1: %s\n", fname1);
+                parallel_print("file2: %s\n", fname2);
+             }
+
              parallel_print("\n");
              /* if given objects is group under root */
              if (HDstrcmp (obj1fullname,"/") || HDstrcmp (obj2fullname,"/"))
@@ -920,6 +1012,7 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char
     nfound = diff_match(file1_id, obj1fullname, info1_lp,
                         file2_id, obj2fullname, info2_lp,
                         match_list, opts);
+    H5TOOLS_DEBUG("diff_match nfound: %d - errstat:%d", nfound, opts->err_stat);
 
 done:
     opts->err_stat = opts->err_stat | ret_value;
@@ -1016,12 +1109,14 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
      *-------------------------------------------------------------------------
      */
 
+    H5TOOLS_DEBUG("exclude_path opts->contents:%d", opts->contents);
     /* not valid compare used when --exclude-path option is used */
     if (!opts->exclude_path) {
         /* number of different objects */
         if (info1->nused != info2->nused) {
             opts->contents = 0;
         }
+        H5TOOLS_DEBUG("opts->exclude_path opts->contents:%d", opts->contents);
     }
 
     /* objects in one file and not the other */
@@ -1030,6 +1125,7 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
             opts->contents = 0;
             break;
         }
+        H5TOOLS_DEBUG("table->nobjs[%d] opts->contents:%d", i, opts->contents);
     }
 
     /*-------------------------------------------------------------------------
@@ -1102,9 +1198,7 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
             opts->cmn_objs = 1;
             if(!g_Parallel) {
                 H5TOOLS_DEBUG("diff paths - errstat:%d", opts->err_stat);
-                nfound += diff(file1_id, obj1_fullpath,
-                               file2_id, obj2_fullpath,
-                            opts, &argdata);
+                nfound += diff(file1_id, obj1_fullpath, file2_id, obj2_fullpath, opts, &argdata);
             } /* end if */
 #ifdef H5_HAVE_PARALLEL
             else {
@@ -1349,6 +1443,8 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
 
     opts->err_stat = opts->err_stat | ret_value;
 
+    free_exclude_attr_list (opts);
+
     /* free table */
     if (table)
         trav_table_free(table);
@@ -1373,7 +1469,7 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
  *-------------------------------------------------------------------------
  */
 hsize_t
-diff(hid_t file1_id, const char *path1, hid_t file2_id, const char *path2, diff_opt_t * opts, diff_args_t *argdata)
+diff(hid_t file1_id, const char *path1, hid_t file2_id, const char *path2, diff_opt_t *opts, diff_args_t *argdata)
 {
     int           status = -1;
     hid_t         dset1_id = H5I_INVALID_HID;
@@ -1422,7 +1518,7 @@ diff(hid_t file1_id, const char *path1, hid_t file2_id, const char *path2, diff_
         if (status == 0) {
             if (opts->no_dangle_links) {
                 /* dangling link is error */
-                if(opts->m_verbose)
+                if(opts->mode_verbose)
                     parallel_print("Warning: <%s> is a dangling link.\n", path1);
                 H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "dangling link is error");
             }
@@ -1437,7 +1533,7 @@ diff(hid_t file1_id, const char *path1, hid_t file2_id, const char *path2, diff_
         if (status == 0) {
             if (opts->no_dangle_links) {
                 /* dangling link is error */
-                if(opts->m_verbose)
+                if(opts->mode_verbose)
                     parallel_print("Warning: <%s> is a dangling link.\n", path2);
                 H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "dangling link is error");
             }
@@ -1463,11 +1559,11 @@ diff(hid_t file1_id, const char *path1, hid_t file2_id, const char *path2, diff_
     /* if objects are not the same type */
     if (argdata->type[0] != argdata->type[1]) {
         H5TOOLS_DEBUG("diff objects are not the same");
-        if (opts->m_verbose||opts->m_list_not_cmp) {
+        if (opts->mode_verbose||opts->mode_list_not_cmp) {
             parallel_print("Not comparable: <%s> is of type %s and <%s> is of type %s\n",
-            path1, get_type(argdata->type[0]),
-            path2, get_type(argdata->type[1]));
+                    path1, get_type(argdata->type[0]), path2, get_type(argdata->type[1]));
         }
+
         opts->not_cmp = 1;
         /* TODO: will need to update non-comparable is different
          * opts->contents = 0;
@@ -1492,7 +1588,7 @@ diff(hid_t file1_id, const char *path1, hid_t file2_id, const char *path2, diff_
                         object_type == H5TRAV_TYPE_GROUP);
         if (opts->follow_links || is_hard_link) {
             /* print information is only verbose option is used */
-            if(opts->m_verbose || opts->m_report) {
+            if(opts->mode_verbose || opts->mode_report) {
                 switch(object_type) {
                     case H5TRAV_TYPE_DATASET:
                         do_print_objname("dataset", path1, path2, opts);
@@ -1521,7 +1617,7 @@ diff(hid_t file1_id, const char *path1, hid_t file2_id, const char *path2, diff_
                 } /* switch(type)*/
 
                 print_found(nfound);
-            } /* if(opts->m_verbose || opts->m_report) */
+            } /* if(opts->mode_verbose || opts->mode_report) */
 
             /* exact same, so comparison is done */
             H5TOOLS_GOTO_DONE(H5DIFF_NO_ERR);
@@ -1539,15 +1635,16 @@ diff(hid_t file1_id, const char *path1, hid_t file2_id, const char *path2, diff_
                 H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "H5Dopen2 failed");
             if((dset2_id = H5Dopen2(file2_id, path2, H5P_DEFAULT)) < 0)
                 H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "H5Dopen2 failed");
+            H5TOOLS_DEBUG("paths: %s - %s", path1, path2);
             /* verbose (-v) and report (-r) mode */
-            if(opts->m_verbose || opts->m_report) {
+            if(opts->mode_verbose || opts->mode_report) {
                 do_print_objname("dataset", path1, path2, opts);
                 H5TOOLS_DEBUG("call diff_dataset 1:%s  2:%s ", path1, path2);
                 nfound = diff_dataset(file1_id, file2_id, path1, path2, opts);
                 print_found(nfound);
             }
             /* quiet mode (-q), just count differences */
-            else if(opts->m_quiet) {
+            else if(opts->mode_quiet) {
                 nfound = diff_dataset(file1_id, file2_id, path1, path2, opts);
             }
             /* the rest (-c, none, ...) */
@@ -1567,7 +1664,7 @@ diff(hid_t file1_id, const char *path1, hid_t file2_id, const char *path2, diff_
              * referenced object
              *---------------------------------------------------------
              */
-            if(path1) {
+            if(path1 && !is_exclude_attr(path1, object_type, opts)) {
                 H5TOOLS_DEBUG( "call diff_attr 1:%s  2:%s ", path1, path2);
                 nfound += diff_attr(dset1_id, dset2_id, path1, path2, opts);
             }
@@ -1599,7 +1696,7 @@ diff(hid_t file1_id, const char *path1, hid_t file2_id, const char *path2, diff_
                 do_print_objname("datatype", path1, path2, opts);
 
             /* always print the number of differences found in verbose mode */
-            if(opts->m_verbose)
+            if(opts->mode_verbose)
                 print_found(nfound);
 
             /*-----------------------------------------------------------------
@@ -1608,7 +1705,7 @@ diff(hid_t file1_id, const char *path1, hid_t file2_id, const char *path2, diff_
              * referenced object
              *-----------------------------------------------------------------
              */
-            if(path1) {
+            if(path1 && !is_exclude_attr(path1, object_type, opts)) {
                 H5TOOLS_DEBUG("call diff_attr 1:%s  2:%s ", path1, path2);
                 nfound += diff_attr(type1_id, type2_id, path1, path2, opts);
             }
@@ -1629,7 +1726,7 @@ diff(hid_t file1_id, const char *path1, hid_t file2_id, const char *path2, diff_
                 do_print_objname("group", path1, path2, opts);
 
             /* always print the number of differences found in verbose mode */
-            if(opts->m_verbose)
+            if(opts->mode_verbose)
                 print_found(nfound);
 
             if((grp1_id = H5Gopen2(file1_id, path1, H5P_DEFAULT)) < 0)
@@ -1643,7 +1740,7 @@ diff(hid_t file1_id, const char *path1, hid_t file2_id, const char *path2, diff_
              * referenced object
              *-----------------------------------------------------------------
              */
-            if(path1) {
+            if(path1 && !is_exclude_attr(path1, object_type, opts)) {
                 H5TOOLS_DEBUG("call diff_attr 1:%s  2:%s ", path1, path2);
                 nfound += diff_attr(grp1_id, grp2_id, path1, path2, opts);
             }
@@ -1671,7 +1768,7 @@ diff(hid_t file1_id, const char *path1, hid_t file2_id, const char *path2, diff_
                     do_print_objname("link", path1, path2, opts);
 
                 /* always print the number of differences found in verbose mode */
-                if(opts->m_verbose)
+                if(opts->mode_verbose)
                     print_found(nfound);
                 }
             break;
@@ -1721,14 +1818,14 @@ diff(hid_t file1_id, const char *path1, hid_t file2_id, const char *path2, diff_
                 } /* end else */
 
                 /* always print the number of differences found in verbose mode */
-                if(opts->m_verbose)
+                if(opts->mode_verbose)
                     print_found(nfound);
             }
             break;
 
         case H5TRAV_TYPE_UNKNOWN:
         default:
-            if(opts->m_verbose)
+            if(opts->mode_verbose)
                 parallel_print("Comparison not supported: <%s> and <%s> are of type %s\n",
                     path1, path2, get_type(object_type) );
             opts->not_cmp = 1;
@@ -1750,7 +1847,7 @@ done:
     }
     /* path1 is dangling link */
     else if (is_dangle_link1) {
-        if(opts->m_verbose)
+        if(opts->mode_verbose)
            parallel_print("obj1 <%s> is a dangling link.\n", path1);
         nfound++;
         if(print_objname(opts, nfound))
@@ -1758,7 +1855,7 @@ done:
     }
     /* path2 is dangling link */
     else if (is_dangle_link2) {
-        if(opts->m_verbose)
+        if(opts->mode_verbose)
             parallel_print("obj2 <%s> is a dangling link.\n", path2);
         nfound++;
         if(print_objname(opts, nfound))
diff --git a/tools/lib/h5diff.h b/tools/lib/h5diff.h
index b04ec23..0209d31 100644
--- a/tools/lib/h5diff.h
+++ b/tools/lib/h5diff.h
@@ -15,25 +15,9 @@
 #define H5DIFF_H__
 
 #include "hdf5.h"
+#include "h5tools.h"
 #include "h5trav.h"
 
-/*
- * Debug printf macros. The prefix allows output filtering by test scripts.
- */
-#ifdef H5DIFF_DEBUG
-#define h5difftrace(x) HDfprintf(stderr, "h5diff debug: " x)
-#define h5diffdebug2(x1, x2) HDfprintf(stderr, "h5diff debug: " x1, x2)
-#define h5diffdebug3(x1, x2, x3) HDfprintf(stderr, "h5diff debug: " x1, x2, x3)
-#define h5diffdebug4(x1, x2, x3, x4) HDfprintf(stderr, "h5diff debug: " x1, x2, x3, x4)
-#define h5diffdebug5(x1, x2, x3, x4, x5) HDfprintf(stderr, "h5diff debug: " x1, x2, x3, x4, x5)
-#else
-#define h5difftrace(x)
-#define h5diffdebug2(x1, x2)
-#define h5diffdebug3(x1, x2, x3)
-#define h5diffdebug4(x1, x2, x3, x4)
-#define h5diffdebug5(x1, x2, x3, x4, x5)
-#endif
-
 #define MAX_FILENAME 1024
 
 /*-------------------------------------------------------------------------
@@ -52,11 +36,12 @@ typedef struct {
  */
 /* linked list to keep exclude path list */
 struct exclude_path_list {
-    char  *obj_path;
-    h5trav_type_t obj_type;
-    struct exclude_path_list * next;
+    const char                 *obj_path;
+    h5trav_type_t               obj_type;
+    struct exclude_path_list   *next;
 };
 
+
 /* Enumeration value for keeping track of whether an error occurred or differences were found */
 typedef enum {
     H5DIFF_NO_ERR,   /* No error occurred */
@@ -65,27 +50,45 @@ typedef enum {
 } diff_err_t;
 
 typedef struct {
-    int        m_quiet;               /* quiet mode: no output at all */
-    int        m_report;              /* report mode: print the data */
-    int        m_verbose;             /* verbose mode: print the data, list of objcets, warnings */
-    int        m_verbose_level;       /* control verbose details */
-    int        d;                     /* delta, absolute value to compare */
-    double     delta;                 /* delta value */
-    int        p;                     /* relative error to compare*/
-    int        use_system_epsilon;    /* flag to use system epsilon (1 or 0) */
-    double     percent;               /* relative error value */
-    int        n;                     /* count, compare up to count */
-    hsize_t    count;                 /* count value */
-    hbool_t    follow_links;          /* follow symbolic links */
-    int        no_dangle_links;       /* return error when find dangling link */
-    diff_err_t err_stat;              /* an error ocurred (2, error, 1, differences, 0, no error) */
-    int        cmn_objs;              /* do we have common objects */
-    int        not_cmp;               /* are the objects comparable */
-    int        contents;              /* equal contents */
-    int        do_nans;               /* consider Nans while diffing floats */
-    int        m_list_not_cmp;        /* list not comparable messages */
-    int        exclude_path;          /* exclude path to an object */
-    struct     exclude_path_list * exclude; /* keep exclude path list */
+    int        mode_quiet;                 /* quiet mode: no output at all */
+    int        mode_report;                /* report mode: print the data */
+    int        mode_verbose;               /* verbose mode: print the data, list of objcets, warnings */
+    int        mode_verbose_level;         /* control verbose details */
+    int        mode_list_not_cmp;          /* list not comparable messages */
+    int        print_header;               /* print header */
+    int        print_percentage;           /* print percentage */
+    int        delta_bool;                 /* delta, absolute value to compare */
+    double     delta;                      /* delta value */
+    int        use_system_epsilon;         /* flag to use system epsilon (1 or 0) */
+    int        percent_bool;               /* relative error to compare*/
+    double     percent;                    /* relative error value */
+    hbool_t    follow_links;               /* follow symbolic links */
+    int        no_dangle_links;            /* return error when find dangling link */
+    int        cmn_objs;                   /* do we have common objects */
+    int        not_cmp;                    /* are the objects comparable */
+    int        contents;                   /* equal contents */
+    int        do_nans;                    /* consider Nans while diffing floats */
+    int        exclude_path;               /* exclude path to an object */
+    int        exclude_attr_path;          /* exclude path to an object */
+    struct     exclude_path_list *exclude; /* keep exclude path list */
+    struct     exclude_path_list *exclude_attr; /* keep exclude attribute list */
+    int        count_bool;                 /* count, compare up to count */
+    hsize_t    count;                      /* count value */
+    diff_err_t err_stat;                   /* an error ocurred (2, error, 1, differences, 0, no error) */
+    hsize_t    nelmts;                     /* total number of elements */
+    hsize_t    hs_nelmts;                  /* number of elements to read at a time*/
+    int        rank;                       /* dimensionality */
+    size_t     m_size;                     /* m_size for diff */
+    hid_t      m_tid;                      /* m_tid for diff */
+    hsize_t    dims[H5S_MAX_RANK];         /* dimensions of object */
+    hsize_t    p_min_idx[H5S_MAX_RANK];    /* min selected index */
+    hsize_t    p_max_idx[H5S_MAX_RANK];    /* max selected index */
+    hsize_t    acc[H5S_MAX_RANK];          /* accumulator position */
+    hsize_t    pos[H5S_MAX_RANK];          /* matrix position */
+    hsize_t    sm_pos[H5S_MAX_RANK];       /* stripmine position */
+    char       *obj_name[2];               /* name for object */
+    struct     subset_t *sset[2];          /* subsetting parameters */
+    hbool_t    custom_vol[2];              /* Using a custom input, output VOL? */
 } diff_opt_t;
 
 
@@ -98,18 +101,9 @@ typedef struct {
 extern "C" {
 #endif
 
-H5TOOLS_DLL hsize_t  h5diff(const char *fname1,
-                const char *fname2,
-                const char *objname1,
-                const char *objname2,
-                diff_opt_t *opts);
+H5TOOLS_DLL hsize_t h5diff(const char *fname1, const char *fname2, const char *objname1, const char *objname2, diff_opt_t *opts);
 
-H5TOOLS_DLL hsize_t diff( hid_t      file1_id,
-              const char *path1,
-              hid_t      file2_id,
-              const char *path2,
-              diff_opt_t *opts,
-              diff_args_t *argdata);
+H5TOOLS_DLL hsize_t diff(hid_t file1_id, const char *path1, hid_t file2_id, const char *path2, diff_opt_t *opts, diff_args_t *argdata);
 
 #ifdef H5_HAVE_PARALLEL
 H5TOOLS_DLL void phdiff_dismiss_workers(void);
@@ -128,63 +122,29 @@ H5TOOLS_DLL void print_manager_output(void);
  */
 
 
-hsize_t diff_dataset( hid_t file1_id,
-                      hid_t file2_id,
-                      const char *obj1_name,
-                      const char *obj2_name,
-                      diff_opt_t *opts);
-
-hsize_t diff_datasetid( hid_t dset1_id,
-                        hid_t dset2_id,
-                        const char *obj1_name,
-                        const char *obj2_name,
-                        diff_opt_t *opts);
-
-
-hsize_t diff_match( hid_t file1_id, const char *grp1, trav_info_t *info1,
-                    hid_t file2_id, const char *grp2, trav_info_t *info2,
-                    trav_table_t *table, diff_opt_t *opts );
-
-hsize_t diff_array( void *_mem1,
-                    void *_mem2,
-                    hsize_t nelmts,
-                    hsize_t hyper_start,
-                    int rank,
-                    hsize_t *dims,
-                    diff_opt_t *opts,
-                    const char *name1,
-                    const char *name2,
-                    hid_t m_type,
-                    hid_t container1_id,
-                    hid_t container2_id); /* dataset where the reference came from*/
-
-
-int diff_can_type( hid_t       f_type1, /* file data type */
-                   hid_t       f_type2, /* file data type */
-                   int         rank1,
-                   int         rank2,
-                   hsize_t     *dims1,
-                   hsize_t     *dims2,
-                   hsize_t     *maxdim1,
-                   hsize_t     *maxdim2,
-                   const char  *obj1_name,
-                   const char  *obj2_name,
-                   diff_opt_t  *opts,
-                   int         is_compound);
-
-hsize_t diff_attr_data(hid_t attr1_id,
-                  hid_t attr2_id,
-                  const char *attr1_name,
-                  const char *attr2_name,
-                  const char *path1,
-                  const char *path2,
-                  diff_opt_t *opts);
-
-hsize_t diff_attr(hid_t loc1_id,
-                  hid_t loc2_id,
-                  const char *path1,
-                  const char *path2,
-                  diff_opt_t *opts);
+hsize_t diff_dataset(hid_t file1_id, hid_t file2_id,
+                     const char *obj1_name, const char *obj2_name, diff_opt_t *opts);
+
+hsize_t diff_datasetid(hid_t dset1_id, hid_t dset2_id,
+                       const char *obj1_name, const char *obj2_name, diff_opt_t *opts);
+
+
+hsize_t diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
+                   hid_t file2_id, const char *grp2, trav_info_t *info2,
+                   trav_table_t *table, diff_opt_t *opts);
+
+hsize_t diff_array(void *_mem1, void *_mem2,
+                   diff_opt_t *opts, hid_t container1_id, hid_t container2_id);
+
+int diff_can_type(hid_t f_type1, hid_t f_type2, int rank1, int rank2,
+                  hsize_t *dims1, hsize_t *dims2, hsize_t *maxdim1, hsize_t *maxdim2,
+                  diff_opt_t *opts, int is_compound);
+
+hsize_t diff_attr_data(hid_t attr1_id, hid_t attr2_id, const char *name1, const char *name2,
+                    const char *path1, const char *path2, diff_opt_t *opts);
+
+hsize_t diff_attr(hid_t loc1_id, hid_t loc2_id,
+                  const char *path1, const char *path2, diff_opt_t *opts);
 
 
 /*-------------------------------------------------------------------------
diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c
index fc5b97a..f46dc73 100644
--- a/tools/lib/h5diff_array.c
+++ b/tools/lib/h5diff_array.c
@@ -132,97 +132,39 @@ typedef struct mcomp_t {
  * local prototypes
  *-------------------------------------------------------------------------
  */
-static hsize_t diff_region(hid_t obj1_id, hid_t obj2_id, hid_t region1_id,
-        hid_t region2_id, diff_opt_t *opts);
 static hbool_t all_zero(const void *_mem, size_t size);
 static int ull2float(unsigned long long ull_value, float *f_value);
-static hsize_t character_compare(char *mem1, char *mem2, hsize_t i, size_t u,
-        int rank, hsize_t *dims, hsize_t *acc, hsize_t *pos,
-        diff_opt_t *opts, const char *obj1, const char *obj2, int *ph);
-static hsize_t character_compare_opt(unsigned char *mem1, unsigned char *mem2,
-        hsize_t i, int rank, hsize_t *dims, hsize_t *acc, hsize_t *pos,
-        diff_opt_t *opts, const char *obj1, const char *obj2, int *ph);
+static hsize_t character_compare(char *mem1, char *mem2, hsize_t elemtno, ssize_t u, diff_opt_t *opts);
+static hsize_t character_compare_opt(unsigned char *mem1, unsigned char *mem2, hsize_t elemtno, diff_opt_t *opts);
 static hbool_t equal_float(float value, float expected, diff_opt_t *opts);
 static hbool_t equal_double(double value, double expected, diff_opt_t *opts);
 #if H5_SIZEOF_LONG_DOUBLE !=0
 static hbool_t equal_ldouble(long double value, long double expected, diff_opt_t *opts);
 #endif
+
 static int print_data(diff_opt_t *opts);
-static void print_pos(int *ph, int pp, hsize_t curr_pos, hsize_t *acc,
-        hsize_t *pos, int rank, hsize_t *dims, const char *obj1,
-        const char *obj2);
-static void print_char_pos(int *ph, int pp, hsize_t curr_pos, size_t u,
-        hsize_t *acc, hsize_t *pos, int rank, hsize_t *dims, const char *obj1,
-        const char *obj2);
+static void print_pos(diff_opt_t *opts, hsize_t elemtno, ssize_t u);
 static void h5diff_print_char(char ch);
-static hsize_t diff_datum(void *_mem1, void *_mem2, hid_t m_type, hsize_t idx,
-        int rank, hsize_t *dims, hsize_t *acc, hsize_t *pos,
-        diff_opt_t *opts, const char *obj1, const char *obj2,
-        hid_t container1_id, hid_t container2_id, /*where the reference came from*/
-        int *ph, /*print header */
-        mcomp_t *members); /*compound members */
-static hsize_t diff_float(unsigned char *mem1, unsigned char *mem2,
-        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
-        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
-        const char *obj2, int *ph);
-static hsize_t diff_double(unsigned char *mem1, unsigned char *mem2,
-        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
-        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
-        const char *obj2, int *ph);
+
+static hsize_t diff_region(hid_t obj1_id, hid_t obj2_id, hid_t region1_id, hid_t region2_id, diff_opt_t *opts);
+static hsize_t diff_datum(void *_mem1, void *_mem2, hsize_t elemtno, diff_opt_t *opts,
+        hid_t container1_id, hid_t container2_id, mcomp_t *members);
+/* element diffs */
+static hsize_t diff_float_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, diff_opt_t *opts);
+static hsize_t diff_double_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, diff_opt_t *opts);
 #if H5_SIZEOF_LONG_DOUBLE !=0
-static hsize_t diff_ldouble(unsigned char *mem1,
-        unsigned char *mem2,
-        hsize_t nelmts,
-        hsize_t hyper_start,
-        int rank,
-        hsize_t *dims,
-        hsize_t *acc,
-        hsize_t *pos,
-        diff_opt_t *opts,
-        const char *obj1,
-        const char *obj2,
-        int *ph);
+static hsize_t diff_ldouble_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, diff_opt_t *opts);
 #endif
-static hsize_t diff_schar(unsigned char *mem1, unsigned char *mem2,
-        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
-        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
-        const char *obj2, int *ph);
-static hsize_t diff_uchar(unsigned char *mem1, unsigned char *mem2,
-        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
-        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
-        const char *obj2, int *ph);
-static hsize_t diff_short(unsigned char *mem1, unsigned char *mem2,
-        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
-        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
-        const char *obj2, int *ph);
-static hsize_t diff_ushort(unsigned char *mem1, unsigned char *mem2,
-        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
-        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
-        const char *obj2, int *ph);
-static hsize_t diff_int(unsigned char *mem1, unsigned char *mem2,
-        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
-        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
-        const char *obj2, int *ph);
-static hsize_t diff_uint(unsigned char *mem1, unsigned char *mem2,
-        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
-        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
-        const char *obj2, int *ph);
-static hsize_t diff_long(unsigned char *mem1, unsigned char *mem2,
-        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
-        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
-        const char *obj2, int *ph);
-static hsize_t diff_ulong(unsigned char *mem1, unsigned char *mem2,
-        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
-        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
-        const char *obj2, int *ph);
-static hsize_t diff_llong(unsigned char *mem1, unsigned char *mem2,
-        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
-        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
-        const char *obj2, int *ph);
-static hsize_t diff_ullong(unsigned char *mem1, unsigned char *mem2,
-        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
-        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
-        const char *obj2, int *ph);
+static hsize_t diff_schar_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, diff_opt_t *opts);
+static hsize_t diff_uchar_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, diff_opt_t *opts);
+static hsize_t diff_short_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, diff_opt_t *opts);
+static hsize_t diff_ushort_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, diff_opt_t *opts);
+static hsize_t diff_int_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, diff_opt_t *opts);
+static hsize_t diff_uint_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, diff_opt_t *opts);
+static hsize_t diff_long_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, diff_opt_t *opts);
+static hsize_t diff_ulong_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, diff_opt_t *opts);
+static hsize_t diff_llong_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, diff_opt_t *opts);
+static hsize_t diff_ullong_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, diff_opt_t *opts);
 
 /*-------------------------------------------------------------------------
  * NaN detection
@@ -260,26 +202,23 @@ static void close_member_types(mcomp_t *members);
  *-------------------------------------------------------------------------
  */
 
-hsize_t diff_array(void *_mem1, void *_mem2, hsize_t nelmts, hsize_t hyper_start,
-        int rank, hsize_t *dims, diff_opt_t *opts, const char *name1, const char *name2,
-        hid_t m_type, hid_t container1_id, hid_t container2_id)
+hsize_t
+diff_array(void *_mem1, void *_mem2, diff_opt_t *opts, hid_t container1_id, hid_t container2_id)
 {
     hsize_t         nfound = 0; /* number of differences found */
     size_t          size; /* size of datum */
     unsigned char  *mem1 = (unsigned char*) _mem1;
     unsigned char  *mem2 = (unsigned char*) _mem2;
-    hsize_t         acc[32]; /* accumulator position */
-    hsize_t         pos[32]; /* matrix position */
-    int             ph = 1; /* print header  */
     hsize_t         i;
-    int             j;
     mcomp_t         members;
     H5T_class_t     type_class;
 
-    H5TOOLS_START_DEBUG(" - errstat:%d", opts->err_stat);
+    H5TOOLS_START_DEBUG(" - rank:%d hs_nelmts:%ld errstat:%d", opts->rank, opts->hs_nelmts, opts->err_stat);
+    opts->print_header = 1; /* enable print header  */
+
     /* get the size. */
-    size = H5Tget_size(m_type);
-    type_class = H5Tget_class(m_type);
+    size = H5Tget_size(opts->m_tid);
+    type_class = H5Tget_class(opts->m_tid);
 
     /* Fast comparison first for atomic type by memcmp().
      * It is OK not to list non-atomic type here because it will not be caught
@@ -289,24 +228,18 @@ hsize_t diff_array(void *_mem1, void *_mem2, hsize_t nelmts, hsize_t hyper_start
             type_class != H5T_COMPOUND &&
             type_class != H5T_STRING &&
             type_class != H5T_VLEN &&
-            HDmemcmp(mem1, mem2, size*nelmts) == 0)
+            HDmemcmp(mem1, mem2, size * opts->hs_nelmts) == 0) {
+        H5TOOLS_ENDDEBUG(":Fast comparison - errstat:%d", opts->err_stat);
         return 0;
-
-    if (rank > 0) {
-        acc[rank - 1] = 1;
-        for (j = (rank - 2); j >= 0; j--) {
-            acc[j] = acc[j + 1] * dims[j + 1];
-        }
-        for (j = 0; j < rank; j++)
-            pos[j] = 0;
     }
 
-    H5TOOLS_DEBUG("diff_array type_class:%d", type_class);
+    H5TOOLS_DEBUG("type_class:%d", type_class);
     switch (type_class) {
     case H5T_NO_CLASS:
     case H5T_TIME:
     case H5T_NCLASSES:
     default:
+        H5TOOLS_DEBUG("type_class:INVALID");
         HDassert(0);
         break;
 
@@ -315,37 +248,142 @@ hsize_t diff_array(void *_mem1, void *_mem2, hsize_t nelmts, hsize_t hyper_start
      *-------------------------------------------------------------------------
      */
     case H5T_FLOAT:
-        if (H5Tequal(m_type, H5T_NATIVE_FLOAT))
-            nfound = diff_float(mem1, mem2, nelmts, hyper_start, rank, dims, acc, pos, opts, name1, name2, &ph);
-        else if (H5Tequal(m_type, H5T_NATIVE_DOUBLE))
-            nfound = diff_double(mem1, mem2, nelmts, hyper_start, rank, dims, acc, pos, opts, name1, name2, &ph);
+        H5TOOLS_DEBUG("type_class:H5T_FLOAT");
+        if (H5Tequal(opts->m_tid, H5T_NATIVE_FLOAT)) {
+            for (i = 0; i < opts->hs_nelmts; i++) {
+                nfound += diff_float_element(mem1, mem2, i, opts);
+
+                mem1 += sizeof(float);
+                mem2 += sizeof(float);
+                if (opts->count_bool && nfound >= opts->count)
+                    return nfound;
+            } /* nelmts */
+        }
+        else if (H5Tequal(opts->m_tid, H5T_NATIVE_DOUBLE)){
+            for (i = 0; i < opts->hs_nelmts; i++) {
+                nfound += diff_double_element(mem1, mem2, i, opts);
+
+                mem1 += sizeof(double);
+                mem2 += sizeof(double);
+                if (opts->count_bool && nfound >= opts->count)
+                    return nfound;
+            } /* nelmts */
+        }
 #if H5_SIZEOF_LONG_DOUBLE != 0
-        else if (H5Tequal(m_type, H5T_NATIVE_LDOUBLE))
-        nfound = diff_ldouble(mem1, mem2, nelmts, hyper_start, rank, dims, acc, pos, opts, name1, name2, &ph);
+        else if (H5Tequal(opts->m_tid, H5T_NATIVE_LDOUBLE)) {
+            for ( i = 0; i < opts->hs_nelmts; i++) {
+                nfound += diff_ldouble_element(mem1, mem2, i, opts);
+
+                mem1 += sizeof(long double);
+                mem2 += sizeof(long double);
+                if (opts->count_bool && nfound >= opts->count)
+                    return nfound;
+            } /* nelmts */
+        }
 #endif
         break;
 
     case H5T_INTEGER:
-        if (H5Tequal(m_type, H5T_NATIVE_SCHAR))
-            nfound = diff_schar(mem1, mem2, nelmts, hyper_start, rank, dims, acc, pos, opts, name1, name2, &ph);
-        else if (H5Tequal(m_type, H5T_NATIVE_UCHAR))
-            nfound = diff_uchar(mem1, mem2, nelmts, hyper_start, rank, dims, acc, pos, opts, name1, name2, &ph);
-        else if (H5Tequal(m_type, H5T_NATIVE_SHORT))
-            nfound = diff_short(mem1, mem2, nelmts, hyper_start, rank, dims, acc, pos, opts, name1, name2, &ph);
-        else if (H5Tequal(m_type, H5T_NATIVE_USHORT))
-            nfound = diff_ushort(mem1, mem2, nelmts, hyper_start, rank, dims, acc, pos, opts, name1, name2, &ph);
-        else if (H5Tequal(m_type, H5T_NATIVE_INT))
-            nfound = diff_int(mem1, mem2, nelmts, hyper_start, rank, dims, acc, pos, opts, name1, name2, &ph);
-        else if (H5Tequal(m_type, H5T_NATIVE_UINT))
-            nfound = diff_uint(mem1, mem2, nelmts, hyper_start, rank, dims, acc, pos, opts, name1, name2, &ph);
-        else if (H5Tequal(m_type, H5T_NATIVE_LONG))
-            nfound = diff_long(mem1, mem2, nelmts, hyper_start, rank, dims, acc, pos, opts, name1, name2, &ph);
-        else if (H5Tequal(m_type, H5T_NATIVE_ULONG))
-            nfound = diff_ulong(mem1, mem2, nelmts, hyper_start, rank, dims, acc, pos, opts, name1, name2, &ph);
-        else if (H5Tequal(m_type, H5T_NATIVE_LLONG))
-            nfound = diff_llong(mem1, mem2, nelmts, hyper_start, rank, dims, acc, pos, opts, name1, name2, &ph);
-        else if (H5Tequal(m_type, H5T_NATIVE_ULLONG))
-            nfound = diff_ullong(mem1, mem2, nelmts, hyper_start, rank, dims, acc, pos, opts, name1, name2, &ph);
+        H5TOOLS_DEBUG("type_class:H5T_INTEGER");
+        if (H5Tequal(opts->m_tid, H5T_NATIVE_SCHAR)) {
+            for (i = 0; i < opts->hs_nelmts; i++) {
+                nfound += diff_schar_element(mem1, mem2, i, opts);
+                mem1 += sizeof(char);
+                mem2 += sizeof(char);
+                if (opts->count_bool && nfound >= opts->count)
+                    return nfound;
+            } /* nelmts */
+        }
+        else if (H5Tequal(opts->m_tid, H5T_NATIVE_UCHAR)) {
+            for (i = 0; i < opts->hs_nelmts; i++) {
+                nfound += diff_uchar_element(mem1, mem2, i, opts);
+
+                mem1 += sizeof(unsigned char);
+                mem2 += sizeof(unsigned char);
+                if (opts->count_bool && nfound >= opts->count)
+                    return nfound;
+            } /* nelmts */
+        }
+        else if (H5Tequal(opts->m_tid, H5T_NATIVE_SHORT)) {
+            for (i = 0; i < opts->hs_nelmts; i++) {
+                nfound += diff_short_element(mem1, mem2, i, opts);
+
+                mem1 += sizeof(short);
+                mem2 += sizeof(short);
+                if (opts->count_bool && nfound >= opts->count)
+                    return nfound;
+            } /* nelmts */
+        }
+        else if (H5Tequal(opts->m_tid, H5T_NATIVE_USHORT)) {
+            for (i = 0; i < opts->hs_nelmts; i++) {
+                nfound += diff_ushort_element(mem1, mem2, i, opts);
+
+                mem1 += sizeof(unsigned short);
+                mem2 += sizeof(unsigned short);
+                if (opts->count_bool && nfound >= opts->count)
+                    return nfound;
+            } /* nelmts */
+        }
+        else if (H5Tequal(opts->m_tid, H5T_NATIVE_INT)) {
+            for (i = 0; i < opts->hs_nelmts; i++) {
+                nfound += diff_int_element(mem1, mem2, i, opts);
+
+                mem1 += sizeof(int);
+                mem2 += sizeof(int);
+                if (opts->count_bool && nfound >= opts->count)
+                    return nfound;
+            } /* nelmts */
+        }
+        else if (H5Tequal(opts->m_tid, H5T_NATIVE_UINT)) {
+            for (i = 0; i < opts->hs_nelmts; i++) {
+                nfound += diff_int_element(mem1, mem2, i, opts);
+
+                mem1 += sizeof(unsigned int);
+                mem2 += sizeof(unsigned int);
+                if (opts->count_bool && nfound >= opts->count)
+                    return nfound;
+            } /* nelmts */
+        }
+        else if (H5Tequal(opts->m_tid, H5T_NATIVE_LONG)) {
+            for (i = 0; i < opts->hs_nelmts; i++) {
+                nfound += diff_long_element(mem1, mem2, i, opts);
+
+                mem1 += sizeof(long);
+                mem2 += sizeof(long);
+                if (opts->count_bool && nfound >= opts->count)
+                    return nfound;
+            } /* nelmts */
+        }
+        else if (H5Tequal(opts->m_tid, H5T_NATIVE_ULONG)) {
+            for (i = 0; i < opts->hs_nelmts; i++) {
+                nfound += diff_ulong_element(mem1, mem2, i, opts);
+
+                mem1 += sizeof(unsigned long);
+                mem2 += sizeof(unsigned long);
+                if (opts->count_bool && nfound >= opts->count)
+                    return nfound;
+            } /* nelmts */
+        }
+        else if (H5Tequal(opts->m_tid, H5T_NATIVE_LLONG)) {
+            for (i = 0; i < opts->hs_nelmts; i++) {
+                nfound += diff_llong_element(mem1, mem2, i, opts);
+
+                mem1 += sizeof(long long);
+                mem2 += sizeof(long long);
+                if (opts->count_bool && nfound >= opts->count)
+                    return nfound;
+            } /* nelmts */
+        }
+        else if (H5Tequal(opts->m_tid, H5T_NATIVE_ULLONG)) {
+            for (i = 0; i < opts->hs_nelmts; i++) {
+                nfound += diff_ullong_element(mem1, mem2, i, opts);
+
+                mem1 += sizeof(unsigned long long);
+                mem2 += sizeof(unsigned long long);
+                if (opts->count_bool && nfound >= opts->count)
+                    return nfound;
+            } /* nelmts */
+        }
         break;
 
     /*-------------------------------------------------------------------------
@@ -360,13 +398,13 @@ hsize_t diff_array(void *_mem1, void *_mem2, hsize_t nelmts, hsize_t hyper_start
     case H5T_ARRAY:
     case H5T_VLEN:
     case H5T_REFERENCE:
+        H5TOOLS_DEBUG("type_class:OTHER");
         HDmemset(&members, 0, sizeof(mcomp_t));
-        get_member_types(m_type, &members);
-        H5TOOLS_DEBUG("call diff_datum nelmts:%d - errstat:%d", nelmts, opts->err_stat);
-        for (i = 0; i < nelmts; i++) {
-            nfound += diff_datum(mem1 + i * size, mem2 + i * size, m_type, i, rank, dims, acc, pos, opts,
-                    name1, name2, container1_id, container2_id, &ph, &members);
-            if (opts->n && nfound >= opts->count)
+        get_member_types(opts->m_tid, &members);
+        for (i = 0; i < opts->hs_nelmts; i++) {
+            H5TOOLS_DEBUG("opts->pos[%ld]:%ld - nelmts:%ld", i, opts->pos[i], opts->hs_nelmts);
+            nfound += diff_datum(mem1 + i * size, mem2 + i * size, i, opts, container1_id, container2_id, &members);
+            if (opts->count_bool && nfound >= opts->count)
                 break;
         } /* i */
         close_member_types(&members);
@@ -409,12 +447,7 @@ hsize_t diff_array(void *_mem1, void *_mem2, hsize_t nelmts, hsize_t hyper_start
  *-------------------------------------------------------------------------
  */
 static hsize_t
-diff_datum(void *_mem1, void *_mem2, hid_t m_type, hsize_t idx, int rank,
-    hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *opts,
-    const char *obj1, const char *obj2,
-    hid_t container1_id, hid_t container2_id,
-        int *ph,             /*print header */
-        mcomp_t *members)    /*compound members */
+diff_datum(void *_mem1, void *_mem2, hsize_t elemtno, diff_opt_t *opts, hid_t container1_id, hid_t container2_id, mcomp_t *members)
 {
     unsigned char  *mem1 = (unsigned char*) _mem1;
     unsigned char  *mem2 = (unsigned char*) _mem2;
@@ -425,7 +458,6 @@ diff_datum(void *_mem1, void *_mem2, hid_t m_type, hsize_t idx, int rank,
     size_t          offset;
     unsigned        nmembs;
     unsigned        j;
-    hsize_t         nelmts;
     size_t          size = 0;
     hbool_t         iszero1;
     hbool_t         iszero2;
@@ -434,10 +466,10 @@ diff_datum(void *_mem1, void *_mem2, hid_t m_type, hsize_t idx, int rank,
     hbool_t         both_zero;
     diff_err_t      ret_value = opts->err_stat;
 
-    H5TOOLS_START_DEBUG(" - errstat:%d", opts->err_stat);
+    H5TOOLS_START_DEBUG("ph:%d elemtno:%d - errstat:%d", opts->print_header, elemtno, opts->err_stat);
 
-    type_size = H5Tget_size(m_type);
-    type_class = H5Tget_class(m_type);
+    type_size = H5Tget_size(opts->m_tid);
+    type_class = H5Tget_class(opts->m_tid);
 
     /* Fast comparison first for atomic type by memcmp().
      * It is OK not to list non-atomic type here because it will not be caught
@@ -450,7 +482,7 @@ diff_datum(void *_mem1, void *_mem2, hid_t m_type, hsize_t idx, int rank,
             HDmemcmp(mem1, mem2, type_size) == 0)
         H5TOOLS_GOTO_DONE(opts->err_stat);
 
-    switch (H5Tget_class(m_type)) {
+    switch (H5Tget_class(opts->m_tid)) {
     case H5T_NO_CLASS:
     case H5T_TIME:
     case H5T_NCLASSES:
@@ -463,18 +495,22 @@ diff_datum(void *_mem1, void *_mem2, hid_t m_type, hsize_t idx, int rank,
      *-------------------------------------------------------------------------
      */
     case H5T_COMPOUND:
-        H5TOOLS_DEBUG("diff_datum H5T_COMPOUND");
+        H5TOOLS_DEBUG("H5T_COMPOUND");
         {
-            hid_t memb_type = H5I_INVALID_HID;
+            diff_opt_t cmpd_opts;
+
+            cmpd_opts = *opts;
             nmembs = members->n;
 
             for (j = 0; j < nmembs; j++) {
                 offset = members->offsets[j];
-                memb_type = members->ids[j];
+                cmpd_opts.m_tid = members->ids[j];
 
-                nfound += diff_datum(mem1 + offset, mem2 + offset, memb_type, idx,
-                        rank, dims, acc, pos, opts, obj1, obj2, container1_id, container2_id, ph, members->m[j]);
+                nfound += diff_datum(mem1 + offset, mem2 + offset, elemtno, &cmpd_opts, container1_id, container2_id, members->m[j]);
             }
+            opts->err_stat =  opts->err_stat | cmpd_opts.err_stat;
+            opts->print_header = cmpd_opts.print_header;
+            opts->not_cmp = cmpd_opts.not_cmp;
         }
         break;
 
@@ -483,7 +519,7 @@ diff_datum(void *_mem1, void *_mem2, hid_t m_type, hsize_t idx, int rank,
      *-------------------------------------------------------------------------
      */
     case H5T_STRING:
-        H5TOOLS_DEBUG("diff_datum H5T_STRING");
+        H5TOOLS_DEBUG("H5T_STRING");
         {
             char *s = NULL;
             char *sx = NULL;
@@ -492,12 +528,12 @@ diff_datum(void *_mem1, void *_mem2, hid_t m_type, hsize_t idx, int rank,
             size_t size1;
             size_t size2;
             size_t sizex;
-            size_t size_mtype = H5Tget_size(m_type);
-            H5T_str_t pad = H5Tget_strpad(m_type);
+            size_t size_mtype = H5Tget_size(opts->m_tid);
+            H5T_str_t pad = H5Tget_strpad(opts->m_tid);
 
             /* if variable length string */
-            if (H5Tis_variable_str(m_type)) {
-                H5TOOLS_DEBUG("diff_datum H5T_STRING variable");
+            if (H5Tis_variable_str(opts->m_tid)) {
+                H5TOOLS_DEBUG("H5T_STRING variable");
                 /* Get pointer to first string */
                 s1 = *(char **)((void *)mem1);
                 if (s1)
@@ -513,7 +549,7 @@ diff_datum(void *_mem1, void *_mem2, hid_t m_type, hsize_t idx, int rank,
                     size2 = 0;
             }
             else if (H5T_STR_NULLTERM == pad) {
-                H5TOOLS_DEBUG("diff_datum H5T_STRING null term");
+                H5TOOLS_DEBUG("H5T_STRING null term");
                 /* Get pointer to first string */
                 s1 = (char*) mem1;
                 if (s1)
@@ -550,10 +586,10 @@ diff_datum(void *_mem1, void *_mem2, hid_t m_type, hsize_t idx, int rank,
              *       of length of strings.
              *       For now mimic the previous way.
              */
-            H5TOOLS_DEBUG("diff_datum string size:%d", size1);
-            H5TOOLS_DEBUG("diff_datum string size:%d", size2);
+            H5TOOLS_DEBUG("string size:%d", size1);
+            H5TOOLS_DEBUG("string size:%d", size2);
             if (size1 != size2) {
-                H5TOOLS_DEBUG("diff_datum string sizes difference");
+                H5TOOLS_DEBUG("string sizes difference");
                 nfound++;
             }
             if (size1 < size2) {
@@ -572,15 +608,13 @@ diff_datum(void *_mem1, void *_mem2, hid_t m_type, hsize_t idx, int rank,
             /* check for NULL pointer for string */
             if (s != NULL) {
                 /* try fast compare first */
-                if (HDmemcmp(s, sx, size) == 0) {
-                    if (size1 != size2)
-                        if (print_data(opts))
-                            for (u = size; u < sizex; u++)
-                                character_compare(s + u, sx + u, idx, u, rank, dims, acc, pos, opts, obj1, obj2, ph);
+                if ((HDmemcmp(s, sx, size) == 0) && (size1 != size2)) {
+                    for (u = size; u < sizex; u++)
+                        character_compare(s + u, sx + u, elemtno, u, opts);
                 }
                 else
                     for (u = 0; u < size; u++)
-                        nfound += character_compare(s + u, sx + u, idx, u, rank, dims, acc, pos, opts, obj1, obj2, ph);
+                        nfound += character_compare(s + u, sx + u, elemtno, u, opts);
             } /* end check for NULL pointer for string */
         }
         break;
@@ -590,10 +624,10 @@ diff_datum(void *_mem1, void *_mem2, hid_t m_type, hsize_t idx, int rank,
      *-------------------------------------------------------------------------
      */
     case H5T_BITFIELD:
-        H5TOOLS_DEBUG("diff_datum H5T_BITFIELD");
+        H5TOOLS_DEBUG("H5T_BITFIELD");
         /* byte-by-byte comparison */
         for (u = 0; u < type_size; u++)
-            nfound += character_compare_opt(mem1 + u, mem2 + u, idx, rank, dims, acc, pos, opts, obj1, obj2, ph);
+            nfound += character_compare_opt(mem1 + u, mem2 + u, elemtno, opts);
         break;
 
     /*-------------------------------------------------------------------------
@@ -601,10 +635,10 @@ diff_datum(void *_mem1, void *_mem2, hid_t m_type, hsize_t idx, int rank,
      *-------------------------------------------------------------------------
      */
     case H5T_OPAQUE:
-        H5TOOLS_DEBUG("diff_datum H5T_OPAQUE");
+        H5TOOLS_DEBUG("H5T_OPAQUE");
         /* byte-by-byte comparison */
         for (u = 0; u < type_size; u++)
-            nfound += character_compare_opt(mem1 + u, mem2 + u, idx, rank, dims, acc, pos, opts, obj1, obj2, ph);
+            nfound += character_compare_opt(mem1 + u, mem2 + u, elemtno, opts);
         break;
 
     /*-------------------------------------------------------------------------
@@ -617,7 +651,7 @@ diff_datum(void *_mem1, void *_mem2, hid_t m_type, hsize_t idx, int rank,
          * compared, we convert both bit patterns to their corresponding
          * enumeration constant and do a string comparison
          */
-        H5TOOLS_DEBUG("diff_datum H5T_ENUM");
+        H5TOOLS_DEBUG("H5T_ENUM");
         {
             char enum_name1[1024];
             char enum_name2[1024];
@@ -629,11 +663,11 @@ diff_datum(void *_mem1, void *_mem2, hid_t m_type, hsize_t idx, int rank,
                 /* If the enum value cannot be converted to a string
                  * it is set to an error string for later output.
                  */
-                err1 = H5Tenum_nameof(m_type, mem1, enum_name1, sizeof enum_name1);
+                err1 = H5Tenum_nameof(opts->m_tid, mem1, enum_name1, sizeof enum_name1);
                 if (err1 < 0)
                     HDsnprintf(enum_name1, sizeof(enum_name1), "**INVALID VALUE**");
 
-                err2 = H5Tenum_nameof(m_type, mem2, enum_name2, sizeof enum_name2);
+                err2 = H5Tenum_nameof(opts->m_tid, mem2, enum_name2, sizeof enum_name2);
                 if (err2 < 0)
                     HDsnprintf(enum_name2, sizeof(enum_name2), "**INVALID VALUE**");
 
@@ -644,9 +678,9 @@ diff_datum(void *_mem1, void *_mem2, hid_t m_type, hsize_t idx, int rank,
                      * don't attempt to convert them - just report errors.
                      */
                     nfound += 1;
+                    opts->print_percentage = 0;
+                    print_pos(opts, elemtno, -1);
                     if (print_data(opts)) {
-                        print_pos(ph, 0, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
                         parallel_print(S_FORMAT, enum_name1, enum_name2);
                     }
                 }
@@ -654,15 +688,15 @@ diff_datum(void *_mem1, void *_mem2, hid_t m_type, hsize_t idx, int rank,
                     /* Both enum values were valid */
                     if (HDstrcmp(enum_name1, enum_name2) != 0) {
                         nfound = 1;
+                        opts->print_percentage = 0;
+                        print_pos(opts, elemtno, -1);
                         if (print_data(opts)) {
-                            print_pos(ph, 0, idx, acc, pos, rank, dims, obj1, obj2);
-                            parallel_print(SPACES);
                             parallel_print(S_FORMAT, enum_name1, enum_name2);
                         }
                     }
                     else {
                         for (u = 0; u < type_size; u++)
-                            nfound += character_compare_opt(mem1 + u, mem2 + u, idx, rank, dims, acc, pos, opts, obj1, obj2, ph);
+                            nfound += character_compare_opt(mem1 + u, mem2 + u, elemtno, opts);
                     }
                 }
                 /* enable error reporting */
@@ -676,26 +710,32 @@ diff_datum(void *_mem1, void *_mem2, hid_t m_type, hsize_t idx, int rank,
      */
     case H5T_ARRAY:
         {
-            hid_t   memb_type = H5I_INVALID_HID;
             hsize_t adims[H5S_MAX_RANK];
             int     ndims;
+            diff_opt_t arr_opts;
+
+            H5TOOLS_DEBUG("H5T_ARRAY ph=%d", opts->print_header);
 
-            H5TOOLS_DEBUG("diff_datum H5T_ARRAY");
+            arr_opts = *opts;
+            H5TOOLS_DEBUG("Check opts: hs_nelmts:%ld to %ld rank:%d to %ld", opts->hs_nelmts, arr_opts.hs_nelmts, opts->rank, arr_opts.rank);
             /* get the array's base datatype for each element */
-            memb_type = H5Tget_super(m_type);
-            size = H5Tget_size(memb_type);
-            ndims = H5Tget_array_ndims(m_type);
-            H5Tget_array_dims2(m_type, adims);
+            arr_opts.m_tid = H5Tget_super(opts->m_tid);
+            size = H5Tget_size(arr_opts.m_tid);
+            ndims = H5Tget_array_ndims(opts->m_tid);
+            H5Tget_array_dims2(opts->m_tid, adims);
             HDassert(ndims >= 1 && ndims <= H5S_MAX_RANK);
+            H5TOOLS_DEBUG("attr ph=%d", arr_opts.print_header);
 
             /* calculate the number of array elements */
-            for (u = 0, nelmts = 1; u < (unsigned) ndims; u++)
-                nelmts *= adims[u];
-            for (u = 0; u < nelmts; u++) {
-                nfound += diff_datum(mem1 + u * size, mem2 + u * size, memb_type, idx,
-                        rank, dims, acc, pos, opts, obj1, obj2, container1_id, container2_id, ph, members);
-            }
-            H5Tclose(memb_type);
+            for (u = 0, arr_opts.hs_nelmts = 1; u < (unsigned) ndims; u++)
+                arr_opts.hs_nelmts *= adims[u];
+            for (u = 0; u < arr_opts.hs_nelmts; u++) {
+                nfound += diff_datum(mem1 + u * size, mem2 + u * size, elemtno, &arr_opts, container1_id, container2_id, members);
+            }
+            opts->err_stat =  opts->err_stat | arr_opts.err_stat;
+            opts->print_header = arr_opts.print_header;
+            opts->not_cmp = arr_opts.not_cmp;
+            H5Tclose(arr_opts.m_tid);
         }
         break;
 
@@ -704,9 +744,9 @@ diff_datum(void *_mem1, void *_mem2, hid_t m_type, hsize_t idx, int rank,
      *-------------------------------------------------------------------------
      */
     case H5T_REFERENCE:
-        H5TOOLS_DEBUG("diff_datum H5T_REFERENCE");
-        iszero1 = all_zero(_mem1, H5Tget_size(m_type));
-        iszero2 = all_zero(_mem2, H5Tget_size(m_type));
+        H5TOOLS_DEBUG("H5T_REFERENCE");
+        iszero1 = all_zero(_mem1, H5Tget_size(opts->m_tid));
+        iszero2 = all_zero(_mem2, H5Tget_size(opts->m_tid));
         if (iszero1 != iszero2) {
             nfound++;
             H5TOOLS_GOTO_DONE(opts->err_stat);
@@ -714,93 +754,114 @@ diff_datum(void *_mem1, void *_mem2, hid_t m_type, hsize_t idx, int rank,
         else if (!iszero1 && !iszero2) {
             hid_t obj1_id = H5I_INVALID_HID;
             hid_t obj2_id = H5I_INVALID_HID;
+            diff_opt_t ref_opts;
 
-            /*-------------------------------------------------------------------------
-             * H5T_STD_REF_DSETREG
-             * Dataset region reference
-             *-------------------------------------------------------------------------
-             */
-            if (type_size == H5R_DSET_REG_REF_BUF_SIZE) {
-                hid_t region1_id = H5I_INVALID_HID;
-                hid_t region2_id = H5I_INVALID_HID;
-
-                H5TOOLS_INFO("H5T_STD_REF_DSETREG reference type");
-
-                if ((obj1_id = H5Rdereference2(container1_id, H5P_DEFAULT, H5R_DATASET_REGION, _mem1)) < 0) {
-                    opts->err_stat = H5DIFF_ERR;
-                    H5TOOLS_INFO("H5Rdereference2 object 1 failed");
-                }
-                if ((obj2_id = H5Rdereference2(container2_id, H5P_DEFAULT, H5R_DATASET_REGION, _mem2)) < 0) {
-                    opts->err_stat = H5DIFF_ERR;
-                    H5TOOLS_INFO("H5Rdereference2 object 2 failed");
-                }
-                if ((region1_id = H5Rget_region(container1_id, H5R_DATASET_REGION, _mem1)) < 0) {
-                    opts->err_stat = H5DIFF_ERR;
-                    H5TOOLS_INFO("H5Rget_region object 1 failed");
-                }
-                if ((region2_id = H5Rget_region(container2_id, H5R_DATASET_REGION, _mem2)) < 0) {
-                    opts->err_stat = H5DIFF_ERR;
-                    H5TOOLS_INFO("H5Rget_region object 2 failed");
-                }
-
-                nfound = diff_region(obj1_id, obj2_id, region1_id, region2_id, opts);
-
-                H5Oclose(obj1_id);
-                H5Oclose(obj2_id);
-                H5Sclose(region1_id);
-                H5Sclose(region2_id);
-            }/*dataset reference*/
+            ref_opts = *opts;
+            ref_opts.obj_name[0] = NULL;
+            ref_opts.obj_name[1] = NULL;
 
             /*-------------------------------------------------------------------------
              * H5T_STD_REF_OBJ
              * Object references. get the type and OID of the referenced object
              *-------------------------------------------------------------------------
              */
-            else if (type_size == H5R_OBJ_REF_BUF_SIZE) {
+            if (type_size == H5R_OBJ_REF_BUF_SIZE) {
                 H5O_type_t obj1_type;
                 H5O_type_t obj2_type;
 
-                H5TOOLS_INFO("H5T_STD_REF_OBJ reference type");
+                H5TOOLS_DEBUG("ref_type is H5T_STD_REF_OBJ");
+
+                if (H5Rget_obj_type2(container1_id, H5R_OBJECT, _mem1, &obj1_type) >= 0) {
+                    if (H5Rget_obj_type2(container2_id, H5R_OBJECT, _mem2, &obj2_type) >= 0) {
+                        /* check object type */
+                        if (obj1_type == obj2_type) {
+                            if (obj1_type == H5O_TYPE_DATASET) {
+                                if ((obj1_id = H5Rdereference2(container1_id, H5P_DEFAULT, H5R_OBJECT, _mem1)) >= 0) {
+                                    if ((obj2_id = H5Rdereference2(container2_id, H5P_DEFAULT, H5R_OBJECT, _mem2)) >= 0) {
+                                        /* compare */
+                                        nfound = diff_datasetid(obj1_id, obj2_id, opts->obj_name[0], opts->obj_name[1], &ref_opts);
+                                        if(H5Oclose(obj2_id) < 0) {
+                                            ref_opts.err_stat = H5DIFF_ERR;
+                                            H5TOOLS_INFO("H5Oclose H5T_STD_REF_OBJ 2 failed");
+                                        }
+                                    }
+                                    else {
+                                        ref_opts.err_stat = H5DIFF_ERR;
+                                        H5TOOLS_INFO("H5Rdereference2 object 2 failed");
+                                    }
+                                    if(H5Oclose(obj1_id) < 0) {
+                                        ref_opts.err_stat = H5DIFF_ERR;
+                                        H5TOOLS_INFO("H5Oclose H5T_STD_REF_OBJ 1 failed");
+                                    }
+                                }
+                                else {
+                                    ref_opts.err_stat = H5DIFF_ERR;
+                                    H5TOOLS_INFO("H5Rdereference2 object 1 failed");
+                                }
+                            }
+                            else {
+                                if (ref_opts.mode_verbose)
+                                    parallel_print("Warning: Comparison not possible of object types referenced: <%s> and <%s>\n", obj1_type, obj2_type);
+                                ref_opts.not_cmp = 1;
+                            }
+                       }
+                       else {
+                           parallel_print("Different object types referenced: <%s> and <%s>", opts->obj_name[0], opts->obj_name[1]);
+                           ref_opts.not_cmp = 1;
+                           ref_opts.err_stat = H5DIFF_ERR;
+                       }
+                   }
+                   else {
+                       ref_opts.err_stat = H5DIFF_ERR;
+                       H5TOOLS_INFO("H5Rget_obj_type2 object 2 failed");
+                   }
+               }
+               else {
+                   ref_opts.err_stat = H5DIFF_ERR;
+                   H5TOOLS_INFO("H5Rget_obj_type2 object 1 failed");
+               }
+            }/*object reference*/
 
-                if (H5Rget_obj_type2(container1_id, H5R_OBJECT, _mem1, &obj1_type) < 0) {
-                    opts->err_stat = H5DIFF_ERR;
-                    H5TOOLS_INFO("H5Rget_obj_type2 object 1 failed");
-                }
-                if (H5Rget_obj_type2(container2_id, H5R_OBJECT, _mem2, &obj2_type) < 0) {
-                    opts->err_stat = H5DIFF_ERR;
-                    H5TOOLS_INFO("H5Rget_obj_type2 object 2 failed");
-                }
+            /*-------------------------------------------------------------------------
+             * H5T_STD_REF_DSETREG
+             * Dataset region reference
+             *-------------------------------------------------------------------------
+             */
+            else if (type_size == H5R_DSET_REG_REF_BUF_SIZE) {
+                hid_t region1_id = H5I_INVALID_HID;
+                hid_t region2_id = H5I_INVALID_HID;
 
-                /* check object type */
-                if (obj1_type != obj2_type) {
-                    parallel_print("Different object types referenced: <%s> and <%s>", obj1, obj2);
-                    opts->not_cmp = 1;
-                    H5TOOLS_GOTO_DONE(opts->err_stat);
-                }
+                H5TOOLS_DEBUG("H5T_REFERENCE - H5T_STD_REF_DSETREG");
 
-                if ((obj1_id = H5Rdereference2(container1_id, H5P_DEFAULT, H5R_OBJECT, _mem1)) < 0) {
-                    opts->err_stat = H5DIFF_ERR;
-                    H5TOOLS_INFO("H5Rdereference2 object 1 failed");
-                }
-                if ((obj2_id = H5Rdereference2(container2_id, H5P_DEFAULT, H5R_OBJECT, _mem2)) < 0) {
-                    opts->err_stat = H5DIFF_ERR;
-                    H5TOOLS_INFO("H5Rdereference2 object 2 failed");
+                if ((obj1_id = H5Rdereference2(container1_id, H5P_DEFAULT, H5R_DATASET_REGION, _mem1)) >= 0) {
+                    if ((obj2_id = H5Rdereference2(container2_id, H5P_DEFAULT, H5R_DATASET_REGION, _mem2)) >= 0) {
+                        if ((region1_id = H5Rget_region(container1_id, H5R_DATASET_REGION, _mem1)) >= 0) {
+                            if ((region2_id = H5Rget_region(container2_id, H5R_DATASET_REGION, _mem2)) >= 0) {
+                                nfound = diff_region(obj1_id, obj2_id, region1_id, region2_id, &ref_opts);
+                                if(H5Sclose(region2_id) < 0)
+                                    H5TOOLS_INFO("H5Sclose H5T_STD_REF_DSETREG region 2 failed");
+                            }
+                            if(H5Sclose(region1_id) < 0)
+                                H5TOOLS_INFO("H5Sclose H5T_STD_REF_DSETREG region 1 failed");
+                        }
+                        if(H5Oclose(obj2_id) < 0)
+                            H5TOOLS_INFO("H5Oclose H5T_STD_REF_DSETREG region 2 failed");
+                    }
+                    else {
+                        H5TOOLS_INFO("H5Rdereference2 object 2 failed");
+                    }
+                    if(H5Oclose(obj1_id) < 0)
+                        H5TOOLS_INFO("H5Oclose H5T_STD_REF_DSETREG region 1 failed");
                 }
-
-                /* compare */
-                if (obj1_type == H5O_TYPE_DATASET)
-                    nfound = diff_datasetid(obj1_id, obj2_id, NULL, NULL, opts);
                 else {
-                    if (opts->m_verbose)
-                        parallel_print("Warning: Comparison not possible of object types referenced: <%s> and <%s>\n", obj1, obj2);
-                    opts->not_cmp = 1;
+                    H5TOOLS_INFO("H5Rdereference2 object 1 failed");
                 }
-
-                H5Oclose(obj1_id);
-                H5Oclose(obj2_id);
-            }/*object reference*/
+            }/*dataset reference*/
+            opts->print_header = ref_opts.print_header;
+            opts->not_cmp = ref_opts.not_cmp;
+            opts->err_stat = ref_opts.err_stat | ret_value;
         }/*is zero*/
-        H5TOOLS_DEBUG("diff_datum H5T_REFERENCE complete");
+        H5TOOLS_DEBUG("H5T_REFERENCE complete");
         break;
 
     /*-------------------------------------------------------------------------
@@ -809,21 +870,26 @@ diff_datum(void *_mem1, void *_mem2, hid_t m_type, hsize_t idx, int rank,
      */
     case H5T_VLEN:
         {
-            hid_t memb_type = H5I_INVALID_HID;
+            diff_opt_t vl_opts;
 
-            H5TOOLS_DEBUG("diff_datum H5T_VLEN");
+            H5TOOLS_DEBUG("H5T_VLEN");
+
+            vl_opts = *opts;
             /* get the VL sequences's base datatype for each element */
-            memb_type = H5Tget_super(m_type);
-            size = H5Tget_size(memb_type);
+            vl_opts.m_tid = H5Tget_super(opts->m_tid);
+            size = H5Tget_size(vl_opts.m_tid);
 
             /* get the number of sequence elements */
-            nelmts = ((hvl_t *)((void *)mem1))->len;
+            vl_opts.hs_nelmts = ((hvl_t *)((void *)mem1))->len;
 
-            for (j = 0; j < nelmts; j++)
-                nfound += diff_datum(((char *) (((hvl_t *)((void *)mem1))->p)) + j * size, ((char *) (((hvl_t *)((void *)mem2))->p)) + j * size, memb_type, idx,      /* Extra (void *) cast to quiet "cast to create alignment" warning - 2019/07/05, QAK */
-                        rank, dims, acc, pos, opts, obj1, obj2, container1_id, container2_id, ph, members);
+            for (j = 0; j < vl_opts.hs_nelmts; j++)
+                nfound += diff_datum(((char *) (((hvl_t *)((void *)mem1))->p)) + j * size, ((char *) (((hvl_t *)((void *)mem2))->p)) + j * size, elemtno,      /* Extra (void *) cast to quiet "cast to create alignment" warning - 2019/07/05, QAK */
+                        &vl_opts, container1_id, container2_id, members);
+            opts->print_header = vl_opts.print_header;
+            opts->not_cmp = vl_opts.not_cmp;
+            opts->err_stat =  opts->err_stat | vl_opts.err_stat;
 
-            H5Tclose(memb_type);
+            H5Tclose(vl_opts.m_tid);
         }
         break;
 
@@ -832,81 +898,16 @@ diff_datum(void *_mem1, void *_mem2, hid_t m_type, hsize_t idx, int rank,
      *-------------------------------------------------------------------------
      */
     case H5T_INTEGER:
-        H5TOOLS_DEBUG("diff_datum H5T_INTEGER");
-        type_sign = H5Tget_sign(m_type);
+        H5TOOLS_DEBUG("H5T_INTEGER");
+        type_sign = H5Tget_sign(opts->m_tid);
         /*-------------------------------------------------------------------------
          * H5T_NATIVE_SCHAR
          *-------------------------------------------------------------------------
          */
         if (type_size == 1 && type_sign != H5T_SGN_NONE) {
-            char temp1_char;
-            char temp2_char;
-
             if(type_size != sizeof(char))
                 H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "Type size is not char size");
-            HDmemcpy(&temp1_char, mem1, sizeof(char));
-            HDmemcpy(&temp2_char, mem2, sizeof(char));
-            /* -d and !-p */
-            if (opts->d && !opts->p) {
-                if (ABS(temp1_char-temp2_char) > opts->delta) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 0, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT, temp1_char, temp2_char, ABS(temp1_char - temp2_char));
-                    }
-                    nfound++;
-                }
-            }
-            /* !-d and -p */
-            else if (!opts->d && opts->p) {
-                PER(temp1_char, temp2_char);
-
-                if (not_comparable && !both_zero) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P_NOTCOMP, temp1_char, temp2_char, ABS(temp1_char - temp2_char));
-                    }
-                    nfound++;
-                }
-                else if (per > opts->percent) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P, temp1_char, temp2_char, ABS(temp1_char - temp2_char), per);
-                    }
-                    nfound++;
-                }
-            }
-            /* -d and -p */
-            else if (opts->d && opts->p) {
-                PER(temp1_char, temp2_char);
-
-                if (not_comparable && !both_zero) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P_NOTCOMP, temp1_char, temp2_char, ABS(temp1_char - temp2_char));
-                    }
-                    nfound++;
-                }
-                else if (per > opts->percent && ABS(temp1_char - temp2_char) > opts->delta) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P, temp1_char, temp2_char, ABS(temp1_char - temp2_char), per);
-                    }
-                    nfound++;
-                }
-            }
-            else if (temp1_char != temp2_char) {
-                if (print_data(opts)) {
-                    print_pos(ph, 0, idx, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT, temp1_char, temp2_char, ABS(temp1_char - temp2_char));
-                }
-                nfound++;
-            }
+            nfound += diff_schar_element(mem1, mem2, elemtno, opts);
         } /*H5T_NATIVE_SCHAR*/
 
         /*-------------------------------------------------------------------------
@@ -914,75 +915,9 @@ diff_datum(void *_mem1, void *_mem2, hid_t m_type, hsize_t idx, int rank,
          *-------------------------------------------------------------------------
          */
         else if (type_size == 1 && type_sign == H5T_SGN_NONE) {
-            unsigned char temp1_uchar;
-            unsigned char temp2_uchar;
-
             if(type_size != sizeof(unsigned char))
                 H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "Type size is not unsigned char size");
-
-            HDmemcpy(&temp1_uchar, mem1, sizeof(unsigned char));
-            HDmemcpy(&temp2_uchar, mem2, sizeof(unsigned char));
-            /* -d and !-p */
-            if (opts->d && !opts->p) {
-                if (PDIFF(temp1_uchar, temp2_uchar) > opts->delta) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 0, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar));
-                    }
-                    nfound++;
-                }
-            }
-            /* !-d and -p */
-            else if (!opts->d && opts->p) {
-                PER_UNSIGN(signed char, temp1_uchar, temp2_uchar);
-
-                if (not_comparable && !both_zero) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P_NOTCOMP, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar));
-                    }
-                    nfound++;
-                }
-                else if (per > opts->percent) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar), per);
-                    }
-                    nfound++;
-                }
-            }
-            /* -d and -p */
-            else if (opts->d && opts->p) {
-                PER_UNSIGN(signed char, temp1_uchar, temp2_uchar);
-
-                if (not_comparable && !both_zero) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P_NOTCOMP, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar));
-                    }
-                    nfound++;
-                }
-                else if (per > opts->percent && PDIFF(temp1_uchar, temp2_uchar) > opts->delta) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar), per);
-                    }
-                    nfound++;
-                }
-            }
-            else if (temp1_uchar != temp2_uchar) {
-                if (print_data(opts)) {
-                    print_pos(ph, 0, idx, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar));
-                }
-                nfound++;
-            }
+            nfound += diff_uchar_element(mem1, mem2, elemtno, opts);
         } /*H5T_NATIVE_UCHAR*/
 
         /*-------------------------------------------------------------------------
@@ -990,75 +925,9 @@ diff_datum(void *_mem1, void *_mem2, hid_t m_type, hsize_t idx, int rank,
          *-------------------------------------------------------------------------
          */
         else if (type_size == 2 && type_sign != H5T_SGN_NONE) {
-            short temp1_short;
-            short temp2_short;
-
             if(type_size != sizeof(short))
                 H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "Type size is not short size");
-
-            HDmemcpy(&temp1_short, mem1, sizeof(short));
-            HDmemcpy(&temp2_short, mem2, sizeof(short));
-            /* -d and !-p */
-            if (opts->d && !opts->p) {
-                if (ABS(temp1_short - temp2_short) > opts->delta) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 0, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT, temp1_short, temp2_short, ABS(temp1_short - temp2_short));
-                    }
-                    nfound++;
-                }
-            }
-            /* !-d and -p */
-            else if (!opts->d && opts->p) {
-                PER(temp1_short, temp2_short);
-
-                if (not_comparable && !both_zero) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P_NOTCOMP, temp1_short, temp2_short, ABS(temp1_short - temp2_short));
-                    }
-                    nfound++;
-                }
-                else if (per > opts->percent) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P, temp1_short, temp2_short, ABS(temp1_short - temp2_short), per);
-                    }
-                    nfound++;
-                }
-            }
-            /* -d and -p */
-            else if (opts->d && opts->p) {
-                PER(temp1_short, temp2_short);
-
-                if (not_comparable && !both_zero) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P_NOTCOMP, temp1_short, temp2_short, ABS(temp1_short - temp2_short));
-                    }
-                    nfound++;
-                }
-                else if (per > opts->percent && ABS(temp1_short - temp2_short) > opts->delta) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P, temp1_short, temp2_short, ABS(temp1_short - temp2_short), per);
-                    }
-                    nfound++;
-                }
-            }
-            else if (temp1_short != temp2_short) {
-                if (print_data(opts)) {
-                    print_pos(ph, 0, idx, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT, temp1_short, temp2_short, ABS(temp1_short - temp2_short));
-                }
-                nfound++;
-            }
+            nfound += diff_short_element(mem1, mem2, elemtno, opts);
         } /*H5T_NATIVE_SHORT*/
 
         /*-------------------------------------------------------------------------
@@ -1066,75 +935,9 @@ diff_datum(void *_mem1, void *_mem2, hid_t m_type, hsize_t idx, int rank,
          *-------------------------------------------------------------------------
          */
         else if (type_size == 2 && type_sign == H5T_SGN_NONE) {
-            unsigned short temp1_ushort;
-            unsigned short temp2_ushort;
-
             if(type_size != sizeof(unsigned short))
                 H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "Type size is not unsigned short size");
-
-            HDmemcpy(&temp1_ushort, mem1, sizeof(unsigned short));
-            HDmemcpy(&temp2_ushort, mem2, sizeof(unsigned short));
-            /* -d and !-p */
-            if (opts->d && !opts->p) {
-                if (PDIFF(temp1_ushort, temp2_ushort) > opts->delta) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 0, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT, temp1_ushort, temp2_ushort, PDIFF(temp1_ushort, temp2_ushort));
-                    }
-                    nfound++;
-                }
-            }
-            /* !-d and -p */
-            else if (!opts->d && opts->p) {
-                PER_UNSIGN(signed short, temp1_ushort, temp2_ushort);
-
-                if (not_comparable && !both_zero) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P_NOTCOMP, temp1_ushort, temp2_ushort, PDIFF(temp1_ushort, temp2_ushort));
-                    }
-                    nfound++;
-                }
-                else if (per > opts->percent) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P, temp1_ushort, temp2_ushort, PDIFF(temp1_ushort, temp2_ushort), per);
-                    }
-                    nfound++;
-                }
-            }
-            /* -d and -p */
-            else if (opts->d && opts->p) {
-                PER_UNSIGN(signed short, temp1_ushort, temp2_ushort);
-
-                if (not_comparable && !both_zero) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P_NOTCOMP, temp1_ushort, temp2_ushort, PDIFF(temp1_ushort, temp2_ushort));
-                    }
-                    nfound++;
-                }
-                else if (per > opts->percent && PDIFF(temp1_ushort, temp2_ushort) > opts->delta) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P, temp1_ushort, temp2_ushort, PDIFF(temp1_ushort, temp2_ushort), per);
-                    }
-                    nfound++;
-                }
-            }
-            else if (temp1_ushort != temp2_ushort) {
-                if (print_data(opts)) {
-                    print_pos(ph, 0, idx, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT, temp1_ushort, temp2_ushort, PDIFF(temp1_ushort, temp2_ushort));
-                }
-                nfound++;
-            }
+            nfound += diff_ushort_element(mem1, mem2, elemtno, opts);
         } /*H5T_NATIVE_USHORT*/
 
         /*-------------------------------------------------------------------------
@@ -1142,75 +945,9 @@ diff_datum(void *_mem1, void *_mem2, hid_t m_type, hsize_t idx, int rank,
          *-------------------------------------------------------------------------
          */
         else if (type_size == 4 && type_sign != H5T_SGN_NONE) {
-            int temp1_int;
-            int temp2_int;
-
             if(type_size != sizeof(int))
                 H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "Type size is not int size");
-
-            HDmemcpy(&temp1_int, mem1, sizeof(int));
-            HDmemcpy(&temp2_int, mem2, sizeof(int));
-            /* -d and !-p */
-            if (opts->d && !opts->p) {
-                if (ABS(temp1_int-temp2_int) > opts->delta) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 0, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT, temp1_int, temp2_int, ABS(temp1_int - temp2_int));
-                    }
-                    nfound++;
-                }
-            }
-            /* !-d and -p */
-            else if (!opts->d && opts->p) {
-                PER(temp1_int, temp2_int);
-
-                if (not_comparable && !both_zero) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P_NOTCOMP, temp1_int, temp2_int, ABS(temp1_int - temp2_int));
-                    }
-                    nfound++;
-                }
-                else if (per > opts->percent) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P, temp1_int, temp2_int, ABS(temp1_int - temp2_int), per);
-                    }
-                    nfound++;
-                }
-            }
-            /* -d and -p */
-            else if (opts->d && opts->p) {
-                PER(temp1_int, temp2_int);
-
-                if (not_comparable && !both_zero) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P_NOTCOMP, temp1_int, temp2_int, ABS(temp1_int - temp2_int));
-                    }
-                    nfound++;
-                }
-                else if (per > opts->percent && ABS(temp1_int - temp2_int) > opts->delta) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P, temp1_int, temp2_int, ABS(temp1_int - temp2_int), per);
-                    }
-                    nfound++;
-                }
-            }
-            else if (temp1_int != temp2_int) {
-                if (print_data(opts)) {
-                    print_pos(ph, 0, idx, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT, temp1_int, temp2_int, ABS(temp1_int - temp2_int));
-                }
-                nfound++;
-            }
+            nfound += diff_int_element(mem1, mem2, elemtno, opts);
         } /*H5T_NATIVE_INT*/
 
         /*-------------------------------------------------------------------------
@@ -1218,75 +955,9 @@ diff_datum(void *_mem1, void *_mem2, hid_t m_type, hsize_t idx, int rank,
          *-------------------------------------------------------------------------
          */
         else if (type_size == 4 && type_sign == H5T_SGN_NONE) {
-            unsigned int temp1_uint;
-            unsigned int temp2_uint;
-
             if(type_size != sizeof(unsigned int))
                 H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "Type size is not unsigned int size");
-
-            HDmemcpy(&temp1_uint, mem1, sizeof(unsigned int));
-            HDmemcpy(&temp2_uint, mem2, sizeof(unsigned int));
-            /* -d and !-p */
-            if (opts->d && !opts->p) {
-                if (PDIFF(temp1_uint, temp2_uint) > opts->delta) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 0, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(UI_FORMAT, temp1_uint, temp2_uint, PDIFF(temp1_uint, temp2_uint));
-                    }
-                    nfound++;
-                }
-            }
-            /* !-d and -p */
-            else if (!opts->d && opts->p) {
-                PER_UNSIGN(signed int, temp1_uint, temp2_uint);
-
-                if (not_comparable && !both_zero) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(UI_FORMAT_P_NOTCOMP, temp1_uint, temp2_uint, PDIFF(temp1_uint, temp2_uint));
-                    }
-                    nfound++;
-                }
-                else if (per > opts->percent) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(UI_FORMAT_P, temp1_uint, temp2_uint, PDIFF(temp1_uint, temp2_uint), per);
-                    }
-                    nfound++;
-                }
-            }
-            /* -d and -p */
-            else if (opts->d && opts->p) {
-                PER_UNSIGN(signed int, temp1_uint, temp2_uint);
-
-                if (not_comparable && !both_zero) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(UI_FORMAT_P_NOTCOMP, temp1_uint, temp2_uint, PDIFF(temp1_uint, temp2_uint));
-                    }
-                    nfound++;
-                }
-                else if (per > opts->percent && PDIFF(temp1_uint,temp2_uint) > opts->delta) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(UI_FORMAT_P, temp1_uint, temp2_uint, PDIFF(temp1_uint, temp2_uint), per);
-                    }
-                    nfound++;
-                }
-            }
-            else if (temp1_uint != temp2_uint) {
-                if (print_data(opts)) {
-                    print_pos(ph, 0, idx, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(UI_FORMAT, temp1_uint, temp2_uint, PDIFF(temp1_uint, temp2_uint));
-                }
-                nfound++;
-            }
+            nfound += diff_uint_element(mem1, mem2, elemtno, opts);
         } /*H5T_NATIVE_UINT*/
 
         /*-------------------------------------------------------------------------
@@ -1294,75 +965,9 @@ diff_datum(void *_mem1, void *_mem2, hid_t m_type, hsize_t idx, int rank,
          *-------------------------------------------------------------------------
          */
         else if (type_size == 8 && type_sign != H5T_SGN_NONE) {
-            long temp1_long;
-            long temp2_long;
-
             if(type_size != sizeof(long))
                 H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "Type size is not long size");
-
-            HDmemcpy(&temp1_long, mem1, sizeof(long));
-            HDmemcpy(&temp2_long, mem2, sizeof(long));
-            /* -d and !-p */
-            if (opts->d && !opts->p) {
-                if (ABS(temp1_long-temp2_long) > opts->delta) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 0, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(LI_FORMAT, temp1_long, temp2_long, ABS(temp1_long - temp2_long));
-                    }
-                    nfound++;
-                }
-            }
-            /* !-d and -p */
-            else if (!opts->d && opts->p) {
-                PER(temp1_long, temp2_long);
-
-                if (not_comparable && !both_zero) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(LI_FORMAT_P_NOTCOMP, temp1_long, temp2_long, ABS(temp1_long - temp2_long));
-                    }
-                    nfound++;
-                }
-                else if (per > opts->percent) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(LI_FORMAT_P, temp1_long, temp2_long, ABS(temp1_long - temp2_long), per);
-                    }
-                    nfound++;
-                }
-            }
-            /* -d and -p */
-            else if (opts->d && opts->p) {
-                PER(temp1_long, temp2_long);
-
-                if (not_comparable && !both_zero) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(LI_FORMAT_P_NOTCOMP, temp1_long, temp2_long, ABS(temp1_long - temp2_long));
-                    }
-                    nfound++;
-                }
-                else if (per > opts->percent && ABS(temp1_long-temp2_long) > opts->delta) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(LI_FORMAT_P, temp1_long, temp2_long, ABS(temp1_long - temp2_long), per);
-                    }
-                    nfound++;
-                }
-            }
-            else if (temp1_long != temp2_long) {
-                if (print_data(opts)) {
-                    print_pos(ph, 0, idx, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(LI_FORMAT, temp1_long, temp2_long, ABS(temp1_long - temp2_long));
-                }
-                nfound++;
-            }
+            nfound += diff_long_element(mem1, mem2, elemtno, opts);
         } /*H5T_NATIVE_LONG*/
 
         /*-------------------------------------------------------------------------
@@ -1370,76 +975,30 @@ diff_datum(void *_mem1, void *_mem2, hid_t m_type, hsize_t idx, int rank,
          *-------------------------------------------------------------------------
          */
         else if (type_size == 8 && type_sign == H5T_SGN_NONE) {
-            unsigned long temp1_ulong;
-            unsigned long temp2_ulong;
-
             if(type_size != sizeof(unsigned long))
                 H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "Type size is not unsigned long size");
+            nfound += diff_ulong_element(mem1, mem2, elemtno, opts);
+        } /*H5T_NATIVE_ULONG*/
 
-            HDmemcpy(&temp1_ulong, mem1, sizeof(unsigned long));
-            HDmemcpy(&temp2_ulong, mem2, sizeof(unsigned long));
-            /* -d and !-p */
-            if (opts->d && !opts->p) {
-                if (PDIFF(temp1_ulong, temp2_ulong) > opts->delta) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 0, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(ULI_FORMAT, temp1_ulong, temp2_ulong, PDIFF(temp1_ulong, temp2_ulong));
-                    }
-                    nfound++;
-                }
-            }
-            /* !-d and -p */
-            else if (!opts->d && opts->p) {
-                PER_UNSIGN(signed long, temp1_ulong, temp2_ulong);
-
-                if (not_comparable && !both_zero) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(ULI_FORMAT_P_NOTCOMP, temp1_ulong, temp2_ulong, PDIFF(temp1_ulong, temp2_ulong));
-                    }
-                    nfound++;
-                }
-                else if (per > opts->percent) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(ULI_FORMAT_P, temp1_ulong, temp2_ulong, PDIFF(temp1_ulong, temp2_ulong), per);
-                    }
-                    nfound++;
-                }
-            }
-            /* -d and -p */
-            else if (opts->d && opts->p) {
-                PER_UNSIGN(signed long, temp1_ulong, temp2_ulong);
+        /*-------------------------------------------------------------------------
+         * H5T_NATIVE_LLONG
+         *-------------------------------------------------------------------------
+         */
+        else if (type_size == 16 && type_sign != H5T_SGN_NONE) {
+            if(type_size != sizeof(long long))
+                H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "Type size is not long long size");
+            nfound += diff_llong_element(mem1, mem2, elemtno, opts);
+        } /*H5T_NATIVE_LLONG*/
 
-                if (not_comparable && !both_zero) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(ULI_FORMAT_P_NOTCOMP, temp1_ulong, temp2_ulong, PDIFF(temp1_ulong, temp2_ulong));
-                    }
-                    nfound++;
-                }
-                else if (per > opts->percent && PDIFF(temp1_ulong,temp2_ulong) > opts->delta) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(ULI_FORMAT_P, temp1_ulong, temp2_ulong, PDIFF(temp1_ulong, temp2_ulong), per);
-                    }
-                    nfound++;
-                }
-            }
-            else if (temp1_ulong != temp2_ulong) {
-                if (print_data(opts)) {
-                    print_pos(ph, 0, idx, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(ULI_FORMAT, temp1_ulong, temp2_ulong, PDIFF(temp1_ulong, temp2_ulong));
-                }
-                nfound++;
-            }
-        } /*H5T_NATIVE_ULONG*/
+        /*-------------------------------------------------------------------------
+         * H5T_NATIVE_ULLONG
+         *-------------------------------------------------------------------------
+         */
+        else if (type_size == 16 && type_sign == H5T_SGN_NONE) {
+            if(type_size != sizeof(unsigned long long))
+                H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "Type size is not unsigned long long size");
+            nfound += diff_ullong_element(mem1, mem2, elemtno, opts);
+        } /*H5T_NATIVE_ULLONG*/
         break; /* H5T_INTEGER class */
 
     /*-------------------------------------------------------------------------
@@ -1451,319 +1010,21 @@ diff_datum(void *_mem1, void *_mem2, hid_t m_type, hsize_t idx, int rank,
          * H5T_NATIVE_FLOAT
          *-------------------------------------------------------------------------
          */
-        H5TOOLS_DEBUG("diff_datum H5T_FLOAT");
+        H5TOOLS_DEBUG("H5T_FLOAT");
         if (type_size == 4) {
-            float temp1_float;
-            float temp2_float;
-            hbool_t isnan1 = FALSE;
-            hbool_t isnan2 = FALSE;
-
             if(type_size != sizeof(float))
                 H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "Type size is not float size");
-
-            HDmemcpy(&temp1_float, mem1, sizeof(float));
-            HDmemcpy(&temp2_float, mem2, sizeof(float));
-
-            /* logic for detecting NaNs is different with opts -d, -p and no opts */
-
-            /*-------------------------------------------------------------------------
-             * -d and !-p
-             *-------------------------------------------------------------------------
-             */
-            if (opts->d && !opts->p) {
-                /*-------------------------------------------------------------------------
-                 * detect NaNs
-                 *-------------------------------------------------------------------------
-                 */
-                if (opts->do_nans) {
-                    isnan1 = HDisnan(temp1_float);
-                    isnan2 = HDisnan(temp2_float);
-                }
-
-                /* both not NaN, do the comparison */
-                if (!isnan1 && !isnan2) {
-                    if (ABS(temp1_float-temp2_float) > (float) opts->delta) {
-                        if (print_data(opts)) {
-                            print_pos(ph, 0, idx, acc, pos, rank, dims, obj1, obj2);
-                            parallel_print(SPACES);
-                            parallel_print(F_FORMAT, (double) temp1_float, (double) temp2_float, (double) ABS(temp1_float - temp2_float));
-                        }
-                        nfound++;
-                    }
-                }
-                /* only one is NaN, assume difference */
-                else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 0, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(F_FORMAT, (double) temp1_float, (double) temp2_float, (double) ABS(temp1_float - temp2_float));
-                    }
-                    nfound++;
-                }
-            }
-            /*-------------------------------------------------------------------------
-             * !-d and -p
-             *-------------------------------------------------------------------------
-             */
-            else if (!opts->d && opts->p) {
-                /*-------------------------------------------------------------------------
-                 * detect NaNs
-                 *-------------------------------------------------------------------------
-                 */
-                if (opts->do_nans) {
-                    isnan1 = HDisnan(temp1_float);
-                    isnan2 = HDisnan(temp2_float);
-                }
-
-                /* both not NaN, do the comparison */
-                if (!isnan1 && !isnan2) {
-                    PER(temp1_float, temp2_float);
-
-                    if (not_comparable && !both_zero) {
-                        if (print_data(opts)) {
-                            print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                            parallel_print(SPACES);
-                            parallel_print(F_FORMAT_P_NOTCOMP, (double) temp1_float, (double) temp2_float, (double) ABS(temp1_float - temp2_float));
-                        }
-                        nfound++;
-                    }
-                    else if (per > opts->percent && (double) ABS(temp1_float - temp2_float) > opts->delta) {
-                        if (print_data(opts)) {
-                            print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                            parallel_print(SPACES);
-                            parallel_print(F_FORMAT_P, (double) temp1_float, (double) temp2_float,
-                                    (double) ABS(temp1_float - temp2_float), (double) ABS(1 - temp2_float / temp1_float));
-                        }
-                        nfound++;
-                    }
-                }
-                /* only one is NaN, assume difference */
-                else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 0, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(F_FORMAT, (double) temp1_float, (double) temp2_float, (double) ABS(temp1_float - temp2_float));
-                    }
-                    nfound++;
-                }
-            }
-            /*-------------------------------------------------------------------------
-             * -d and -p
-             *-------------------------------------------------------------------------
-             */
-            else if (opts->d && opts->p) {
-                /*-------------------------------------------------------------------------
-                 * detect NaNs
-                 *-------------------------------------------------------------------------
-                 */
-                if (opts->do_nans) {
-                    isnan1 = HDisnan(temp1_float);
-                    isnan2 = HDisnan(temp2_float);
-                }
-
-                /* both not NaN, do the comparison */
-                if (!isnan1 && !isnan2) {
-                    PER(temp1_float, temp2_float);
-
-                    if (not_comparable && !both_zero) {
-                        if (print_data(opts)) {
-                            print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                            parallel_print(SPACES);
-                            parallel_print(F_FORMAT_P_NOTCOMP, (double) temp1_float, (double) temp2_float, (double) ABS(temp1_float - temp2_float));
-                        }
-                        nfound++;
-                    }
-                    else if (per > opts->percent) {
-                        if (print_data(opts)) {
-                            print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                            parallel_print(SPACES);
-                            parallel_print(F_FORMAT_P, (double) temp1_float, (double) temp2_float,
-                                    (double) ABS(temp1_float - temp2_float), (double) ABS(1 - temp2_float / temp1_float));
-                        }
-                        nfound++;
-                    }
-                }
-                /* only one is NaN, assume difference */
-                else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 0, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(F_FORMAT, (double) temp1_float, (double) temp2_float, (double) ABS(temp1_float - temp2_float));
-                    }
-                    nfound++;
-                }
-            }
-            /*-------------------------------------------------------------------------
-             * no -d and -p
-             *-------------------------------------------------------------------------
-             */
-            else if (equal_float(temp1_float, temp2_float, opts) == FALSE) {
-                if (print_data(opts)) {
-                    print_pos(ph, 0, idx, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(F_FORMAT, (double) temp1_float, (double) temp2_float, (double) ABS(temp1_float - temp2_float));
-                }
-                nfound++;
-            }
-        } /*H5T_NATIVE_FLOAT*/
-
+            nfound += diff_float_element(mem1, mem2, elemtno, opts);
+        }
         /*-------------------------------------------------------------------------
          * H5T_NATIVE_DOUBLE
          *-------------------------------------------------------------------------
          */
         else if (type_size == 8) {
-            double temp1_double;
-            double temp2_double;
-            hbool_t isnan1 = FALSE;
-            hbool_t isnan2 = FALSE;
-
             if(type_size != sizeof(double))
                 H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "Type size is not double size");
-
-            HDmemcpy(&temp1_double, mem1, sizeof(double));
-            HDmemcpy(&temp2_double, mem2, sizeof(double));
-
-            /* logic for detecting NaNs is different with opts -d, -p and no opts */
-            /*-------------------------------------------------------------------------
-             * -d and !-p
-             *-------------------------------------------------------------------------
-             */
-            if (opts->d && !opts->p) {
-                /*-------------------------------------------------------------------------
-                 * detect NaNs
-                 *-------------------------------------------------------------------------
-                 */
-                if (opts->do_nans) {
-                    isnan1 = HDisnan(temp1_double);
-                    isnan2 = HDisnan(temp2_double);
-                }
-
-                /* both not NaN, do the comparison */
-                if (!isnan1 && !isnan2) {
-                    if (ABS(temp1_double-temp2_double) > opts->delta) {
-                        if (print_data(opts)) {
-                            print_pos(ph, 0, idx, acc, pos, rank, dims, obj1, obj2);
-                            parallel_print(SPACES);
-                            parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
-                        }
-                        nfound++;
-                    }
-                }
-                /* only one is NaN, assume difference */
-                else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 0, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
-                    }
-                    nfound++;
-                }
-            } /* opts->d && !opts->p */
-            /*-------------------------------------------------------------------------
-             * !-d and -p
-             *-------------------------------------------------------------------------
-             */
-            else if (!opts->d && opts->p) {
-                /*-------------------------------------------------------------------------
-                 * detect NaNs
-                 *-------------------------------------------------------------------------
-                 */
-                if (opts->do_nans) {
-                    isnan1 = HDisnan(temp1_double);
-                    isnan2 = HDisnan(temp2_double);
-                }
-
-                /* both not NaN, do the comparison */
-                if (!isnan1 && !isnan2) {
-                    PER(temp1_double, temp2_double);
-
-                    if (not_comparable && !both_zero) {
-                        if (print_data(opts)) {
-                            print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                            parallel_print(SPACES);
-                            parallel_print(F_FORMAT_P_NOTCOMP, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
-                        }
-                        nfound++;
-                    }
-                    else if (per > opts->percent) {
-                        if (print_data(opts)) {
-                            print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                            parallel_print(SPACES);
-                            parallel_print(F_FORMAT_P, temp1_double, temp2_double, ABS(temp1_double - temp2_double), ABS(1 - temp2_double / temp1_double));
-                        }
-                        nfound++;
-                    }
-                }
-                /* only one is NaN, assume difference */
-                else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 0, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
-                    }
-                    nfound++;
-                }
-            }
-            /*-------------------------------------------------------------------------
-             * -d and -p
-             *-------------------------------------------------------------------------
-             */
-            else if (opts->d && opts->p) {
-                /*-------------------------------------------------------------------------
-                * detect NaNs
-                *-------------------------------------------------------------------------
-                */
-                if (opts->do_nans) {
-                    isnan1 = HDisnan(temp1_double);
-                    isnan2 = HDisnan(temp2_double);
-                }
-
-                /* both not NaN, do the comparison */
-                if (!isnan1 && !isnan2) {
-                    PER(temp1_double, temp2_double);
-
-                    if (not_comparable && !both_zero) {
-                        if (print_data(opts)) {
-                            print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                            parallel_print(SPACES);
-                            parallel_print(F_FORMAT_P_NOTCOMP, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
-                        }
-                        nfound++;
-                    }
-                    else if (per > opts->percent &&
-                    ABS(temp1_double-temp2_double) > opts->delta) {
-                        if (print_data(opts)) {
-                            print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                            parallel_print(SPACES);
-                            parallel_print(F_FORMAT_P, temp1_double, temp2_double, ABS(temp1_double - temp2_double), ABS(1 - temp2_double / temp1_double));
-                        }
-                        nfound++;
-                    }
-                }
-                /* only one is NaN, assume difference */
-                else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 0, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
-                    }
-                    nfound++;
-                }
-            }
-            /*-------------------------------------------------------------------------
-             * no -d and -p
-             *-------------------------------------------------------------------------
-             */
-            else if (equal_double(temp1_double, temp2_double, opts) == FALSE) {
-                if (print_data(opts)) {
-                    print_pos(ph, 0, idx, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
-                }
-                nfound++;
-            }
-        } /*H5T_NATIVE_DOUBLE*/
-
+            nfound += diff_double_element(mem1, mem2, elemtno, opts);
+        }
 #if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE
 
         /*-------------------------------------------------------------------------
@@ -1771,157 +1032,10 @@ diff_datum(void *_mem1, void *_mem2, hid_t m_type, hsize_t idx, int rank,
          *-------------------------------------------------------------------------
          */
         else if (type_size == H5_SIZEOF_LONG_DOUBLE) {
-            long double temp1_double;
-            long double temp2_double;
-            hbool_t     isnan1 = FALSE;
-            hbool_t     isnan2 = FALSE;
-
             if(type_size != sizeof(long double)) {
                 H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "Type size is not long double size");
             }
-
-            HDmemcpy(&temp1_double, mem1, sizeof(long double));
-            HDmemcpy(&temp2_double, mem2, sizeof(long double));
-
-            /* logic for detecting NaNs is different with options -d, -p and no options */
-
-            /*-------------------------------------------------------------------------
-             * -d and !-p
-             *-------------------------------------------------------------------------
-             */
-            if (opts->d && !opts->p) {
-                /*-------------------------------------------------------------------------
-                 * detect NaNs
-                 *-------------------------------------------------------------------------
-                 */
-                if (opts->do_nans) {
-                    isnan1 = HDisnan(temp1_double);
-                    isnan2 = HDisnan(temp2_double);
-                }
-
-                /* both not NaN, do the comparison */
-                if (!isnan1 && !isnan2) {
-                    if (ABS(temp1_double-temp2_double) > opts->delta) {
-                        if (print_data(opts)) {
-                            print_pos(ph, 0, idx, acc, pos, rank, dims, obj1, obj2);
-                            parallel_print(SPACES);
-                            parallel_print(LD_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
-                        }
-                        nfound++;
-                    }
-                } /* NaN */
-                /* only one is NaN, assume difference */
-                else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 0, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
-                    }
-                    nfound++;
-                }
-            }
-            /*-------------------------------------------------------------------------
-             * !-d and -p
-             *-------------------------------------------------------------------------
-             */
-            else if (!opts->d && opts->p) {
-                /*-------------------------------------------------------------------------
-                 * detect NaNs
-                 *-------------------------------------------------------------------------
-                 */
-                if (opts->do_nans) {
-                    isnan1 = HDisnan(temp1_double);
-                    isnan2 = HDisnan(temp2_double);
-                }
-
-                /* both not NaN, do the comparison */
-                if (!isnan1 && !isnan2) {
-                    PER(temp1_double,temp2_double);
-
-                    if (not_comparable && !both_zero) {
-                        if (print_data(opts)) {
-                            print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                            parallel_print(SPACES);
-                            parallel_print(LD_FORMAT_P_NOTCOMP, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
-                        }
-                        nfound++;
-                    }
-                    else if (per > opts->percent) {
-                        if (print_data(opts)) {
-                            print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                            parallel_print(SPACES);
-                            parallel_print(LD_FORMAT_P, temp1_double, temp2_double, ABS(temp1_double - temp2_double), ABS(1 - temp2_double / temp1_double));
-                        }
-                        nfound++;
-                    }
-                } /* NaN */
-                /* only one is NaN, assume difference */
-                else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 0, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
-                    }
-                    nfound++;
-                }
-            }
-            /*-------------------------------------------------------------------------
-             * -d and -p
-             *-------------------------------------------------------------------------
-             */
-            else if (opts->d && opts->p) {
-                /*-------------------------------------------------------------------------
-                 * detect NaNs
-                 *-------------------------------------------------------------------------
-                 */
-                if (opts->do_nans) {
-                    isnan1 = HDisnan(temp1_double);
-                    isnan2 = HDisnan(temp2_double);
-                }
-
-                /* both not NaN, do the comparison */
-                if (!isnan1 && !isnan2) {
-                    PER(temp1_double,temp2_double);
-
-                    if (not_comparable && !both_zero) {
-                        if (print_data(opts)) {
-                            print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                            parallel_print(SPACES);
-                            parallel_print(LD_FORMAT_P_NOTCOMP, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
-                        }
-                        nfound++;
-                    }
-                    else if (per > opts->percent && ABS(temp1_double-temp2_double) > opts->delta) {
-                        if (print_data(opts)) {
-                            print_pos(ph, 1, idx, acc, pos, rank, dims, obj1, obj2);
-                            parallel_print(SPACES);
-                            parallel_print(LD_FORMAT_P, temp1_double, temp2_double, ABS(temp1_double - temp2_double), ABS(1 - temp2_double / temp1_double));
-                        }
-                        nfound++;
-                    }
-                } /* NaN */
-                /* only one is NaN, assume difference */
-                else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 0, idx, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
-                    }
-                    nfound++;
-                }
-            }
-            /*-------------------------------------------------------------------------
-             * no -d and -p
-             *-------------------------------------------------------------------------
-             */
-            else if (equal_ldouble(temp1_double, temp2_double, opts) == FALSE) {
-                if (print_data(opts)) {
-                    print_pos(ph, 0, idx, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(LD_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
-                }
-                nfound++;
-            }
+            nfound += diff_ldouble_element(mem1, mem2, elemtno, opts);
         } /*H5T_NATIVE_LDOUBLE*/
 #endif  /* H5_SIZEOF_LONG_DOUBLE */
 
@@ -2038,8 +1152,8 @@ static hsize_t diff_region(hid_t obj1_id, hid_t obj2_id, hid_t region1_id, hid_t
         npoints1 = H5Sget_select_elem_npoints(region1_id);
         npoints2 = H5Sget_select_elem_npoints(region2_id);
     } H5E_END_TRY;
-    H5TOOLS_DEBUG("diff_region blocks: 1=%ld-2=%ld", nblocks1, nblocks2);
-    H5TOOLS_DEBUG("diff_region points: 1=%ld-2=%ld", npoints1, npoints2);
+    H5TOOLS_DEBUG("blocks: 1=%ld-2=%ld", nblocks1, nblocks2);
+    H5TOOLS_DEBUG("points: 1=%ld-2=%ld", npoints1, npoints2);
 
     if (nblocks1 != nblocks2 || npoints1 != npoints2 || ndims1 != ndims2) {
         opts->not_cmp = 1;
@@ -2087,8 +1201,9 @@ static hsize_t diff_region(hid_t obj1_id, hid_t obj2_id, hid_t region1_id, hid_t
                 }
 
                 /* print differences if found */
-                if (nfound_b && opts->m_verbose) {
+                if (nfound_b && opts->mode_verbose) {
                     H5O_info_t oi1, oi2;
+                    char *obj1_str = NULL, *obj2_str = NULL;
 
                     H5Oget_info2(obj1_id, &oi1, H5O_INFO_BASIC);
                     H5Oget_info2(obj2_id, &oi2, H5O_INFO_BASIC);
@@ -2147,7 +1262,7 @@ static hsize_t diff_region(hid_t obj1_id, hid_t obj2_id, hid_t region1_id, hid_t
                     }
                 }
 
-                if (nfound_p && opts->m_verbose) {
+                if (nfound_p && opts->mode_verbose) {
                     parallel_print("Region points\n");
                     for (i = 0; i < npoints1; i++) {
                         hsize_t pt1, pt2;
@@ -2207,8 +1322,7 @@ done:
  *-------------------------------------------------------------------------
  */
 
-static hsize_t character_compare(char *mem1, char *mem2, hsize_t i, size_t u,
-        int rank, hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1, const char *obj2, int *ph)
+static hsize_t character_compare(char *mem1, char *mem2, hsize_t elemtno, ssize_t u, diff_opt_t *opts)
 {
     hsize_t nfound = 0; /* differences found */
     char    temp1_uchar;
@@ -2216,12 +1330,13 @@ static hsize_t character_compare(char *mem1, char *mem2, hsize_t i, size_t u,
 
     HDmemcpy(&temp1_uchar, mem1, sizeof(unsigned char));
     HDmemcpy(&temp2_uchar, mem2, sizeof(unsigned char));
-    H5TOOLS_START_DEBUG(" %d=%d",temp1_uchar,temp2_uchar);
+    H5TOOLS_START_DEBUG(" %d=%d", temp1_uchar, temp2_uchar);
 
     if (temp1_uchar != temp2_uchar) {
         if (print_data(opts)) {
-            print_char_pos(ph, 0, i, u, acc, pos, rank, dims, obj1, obj2);
-            parallel_print("            ");
+            opts->print_percentage = 0;
+            print_pos(opts, elemtno, u);
+            parallel_print("  ");
             h5diff_print_char(temp1_uchar);
             parallel_print("            ");
             h5diff_print_char(temp2_uchar);
@@ -2242,1953 +1357,1455 @@ static hsize_t character_compare(char *mem1, char *mem2, hsize_t i, size_t u,
  *-------------------------------------------------------------------------
  */
 
-static hsize_t character_compare_opt(unsigned char *mem1, unsigned char *mem2,
-        hsize_t i, int rank, hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1, const char *obj2, int *ph)
+static hsize_t character_compare_opt(unsigned char *mem1, unsigned char *mem2, hsize_t elemtno, diff_opt_t *opts)
 {
     hsize_t       nfound = 0; /* differences found */
     unsigned char temp1_uchar;
     unsigned char temp2_uchar;
+    hbool_t       both_zero = FALSE;
     double        per;
-    hbool_t       both_zero;
 
     HDmemcpy(&temp1_uchar, mem1, sizeof(unsigned char));
     HDmemcpy(&temp2_uchar, mem2, sizeof(unsigned char));
+    H5TOOLS_START_DEBUG(" %d=%d", temp1_uchar, temp2_uchar);
 
     /* -d and !-p */
 
-    if (opts->d && !opts->p) {
+    if (opts->delta_bool && !opts->percent_bool) {
         if (PDIFF(temp1_uchar,temp2_uchar) > opts->delta) {
+            opts->print_percentage = 0;
+            print_pos(opts, elemtno, -1);
             if (print_data(opts)) {
-                print_pos(ph, 0, i, acc, pos, rank, dims, obj1, obj2);
-                parallel_print(SPACES);
                 parallel_print(I_FORMAT, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar));
             }
             nfound++;
         }
     }
     /* !-d and -p */
-    else if (!opts->d && opts->p) {
+    else if (!opts->delta_bool && opts->percent_bool) {
         PER_UNSIGN(signed char, temp1_uchar, temp2_uchar);
         if (per > opts->percent) {
+            opts->print_percentage = 1;
+            print_pos(opts, elemtno, -1);
             if (print_data(opts)) {
-                print_pos(ph, 1, i, acc, pos, rank, dims, obj1, obj2);
-                parallel_print(SPACES);
                 parallel_print(I_FORMAT_P, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar), per);
             }
             nfound++;
         }
     }
     /* -d and -p */
-    else if (opts->d && opts->p) {
+    else if (opts->delta_bool && opts->percent_bool) {
         PER_UNSIGN(signed char, temp1_uchar, temp2_uchar);
         if (per > opts->percent && PDIFF(temp1_uchar,temp2_uchar) > opts->delta) {
+            opts->print_percentage = 1;
+            print_pos(opts, elemtno, -1);
             if (print_data(opts)) {
-                print_pos(ph, 1, i, acc, pos, rank, dims, obj1, obj2);
-                parallel_print(SPACES);
                 parallel_print(I_FORMAT_P, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar), per);
             }
             nfound++;
         }
     }
     else if (temp1_uchar != temp2_uchar) {
+        opts->print_percentage = 0;
+        print_pos(opts, elemtno, -1);
         if (print_data(opts)) {
-            print_pos(ph, 0, i, acc, pos, rank, dims, obj1, obj2);
-            parallel_print(SPACES);
             parallel_print(I_FORMAT, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar));
         }
         nfound++;
     }
 
+    H5TOOLS_ENDDEBUG(": %d zero:%d", nfound, both_zero);
     return nfound;
 }
 
 /*-------------------------------------------------------------------------
- * Function: diff_float
+ * Function: diff_float_element
  *
- * Purpose:  diff a H5T_NATIVE_FLOAT type
+ * Purpose:  diff a single H5T_NATIVE_FLOAT type
  *
  * Return:   number of differences found
 *
  *-------------------------------------------------------------------------
  */
-static hsize_t diff_float(unsigned char *mem1, unsigned char *mem2,
-        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
-        const char *obj2, int *ph)
-
+static hsize_t diff_float_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, diff_opt_t *opts)
 {
     hsize_t nfound = 0; /* number of differences found */
     float   temp1_float;
     float   temp2_float;
-    hsize_t i;
     double  per;
-    hbool_t both_zero;
+    hbool_t both_zero = FALSE;
     hbool_t isnan1 = FALSE;
     hbool_t isnan2 = FALSE;
 
+    H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool);
+
+    HDmemcpy(&temp1_float, mem1, sizeof(float));
+    HDmemcpy(&temp2_float, mem2, sizeof(float));
+
+    /* logic for detecting NaNs is different with opts -d, -p and no opts */
+
     /*-------------------------------------------------------------------------
      * -d and !-p
      *-------------------------------------------------------------------------
      */
+    if (opts->delta_bool && !opts->percent_bool) {
+        /*-------------------------------------------------------------------------
+         * detect NaNs
+         *-------------------------------------------------------------------------
+         */
+        if (opts->do_nans) {
+            isnan1 = HDisnan(temp1_float);
+            isnan2 = HDisnan(temp2_float);
+        }
 
-    if (opts->d && !opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_float, mem1, sizeof(float));
-            HDmemcpy(&temp2_float, mem2, sizeof(float));
-
-            /*-------------------------------------------------------------------------
-             * detect NaNs
-             *-------------------------------------------------------------------------
-             */
-            if (opts->do_nans) {
-                isnan1 = HDisnan(temp1_float);
-                isnan2 = HDisnan(temp2_float);
-            }
-
-            /* both not NaN, do the comparison */
-            if (!isnan1 && !isnan2) {
-                if ((double) ABS(temp1_float - temp2_float) > opts->delta) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(F_FORMAT, (double) temp1_float, (double) temp2_float, (double) ABS(temp1_float - temp2_float));
-                    }
-                    nfound++;
-                }
-            }
-            /* only one is NaN, assume difference */
-            else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
+        /* both not NaN, do the comparison */
+        if (!isnan1 && !isnan2) {
+            if ((double) ABS(temp1_float - temp2_float) > opts->delta) {
+                opts->print_percentage = 0;
+                print_pos(opts, elem_idx, -1);
                 if (print_data(opts)) {
-                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
                     parallel_print(F_FORMAT, (double) temp1_float, (double) temp2_float, (double) ABS(temp1_float - temp2_float));
                 }
                 nfound++;
-
             }
-            mem1 += sizeof(float);
-            mem2 += sizeof(float);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
-        } /* i */
+        }
+        /* only one is NaN, assume difference */
+        else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
+            opts->print_percentage = 0;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(F_FORMAT, (double) temp1_float, (double) temp2_float, (double) ABS(temp1_float - temp2_float));
+            }
+            nfound++;
+        }
     }
     /*-------------------------------------------------------------------------
-     * !-d and -p
-     *-------------------------------------------------------------------------
-     */
-    else if (!opts->d && opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_float, mem1, sizeof(float));
-            HDmemcpy(&temp2_float, mem2, sizeof(float));
-
-            /*-------------------------------------------------------------------------
-             * detect NaNs
-             *-------------------------------------------------------------------------
-             */
-            if (opts->do_nans) {
-                isnan1 = HDisnan(temp1_float);
-                isnan2 = HDisnan(temp2_float);
-            }
-            /* both not NaN, do the comparison */
-            if ((!isnan1 && !isnan2)) {
-                PER(temp1_float, temp2_float);
+    * !-d and -p
+    *-------------------------------------------------------------------------
+    */
+    else if (!opts->delta_bool && opts->percent_bool) {
+        /*-------------------------------------------------------------------------
+         * detect NaNs
+         *-------------------------------------------------------------------------
+         */
+        if (opts->do_nans) {
+            isnan1 = HDisnan(temp1_float);
+            isnan2 = HDisnan(temp2_float);
+        }
+        /* both not NaN, do the comparison */
+        if ((!isnan1 && !isnan2)) {
+            PER(temp1_float, temp2_float);
 
-                if (not_comparable && !both_zero) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(F_FORMAT_P_NOTCOMP, (double) temp1_float, (double) temp2_float, (double) ABS(temp1_float - temp2_float));
-                    }
-                    nfound++;
-                }
-                else if (per > opts->percent) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(F_FORMAT_P, (double) temp1_float, (double) temp2_float,
-                                (double) ABS(temp1_float - temp2_float), (double) ABS(1 - temp2_float / temp1_float));
-                    }
-                    nfound++;
+            if (not_comparable && !both_zero) {
+                opts->print_percentage = 1;
+                print_pos(opts, elem_idx, -1);
+                if (print_data(opts)) {
+                    parallel_print(F_FORMAT_P_NOTCOMP, (double) temp1_float, (double) temp2_float, (double) ABS(temp1_float - temp2_float));
                 }
+                nfound++;
             }
-            /* only one is NaN, assume difference */
-            else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
+            else if (per > opts->percent) {
+                opts->print_percentage = 1;
+                print_pos(opts, elem_idx, -1);
                 if (print_data(opts)) {
-                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(F_FORMAT, (double) temp1_float, (double) temp2_float, (double) ABS(temp1_float - temp2_float));
+                    parallel_print(F_FORMAT_P, (double) temp1_float, (double) temp2_float,
+                            (double) ABS(temp1_float - temp2_float), (double) ABS(1 - temp2_float / temp1_float));
                 }
                 nfound++;
-
             }
-            mem1 += sizeof(float);
-            mem2 += sizeof(float);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
-        } /* i */
+        }
+        /* only one is NaN, assume difference */
+        else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
+            opts->print_percentage = 0;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(F_FORMAT, (double) temp1_float, (double) temp2_float, (double) ABS(temp1_float - temp2_float));
+            }
+            nfound++;
+        }
     }
     /*-------------------------------------------------------------------------
-     * -d and -p
-     *-------------------------------------------------------------------------
-     */
-    else if (opts->d && opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_float, mem1, sizeof(float));
-            HDmemcpy(&temp2_float, mem2, sizeof(float));
-
-            /*-------------------------------------------------------------------------
-             * detect NaNs
-             *-------------------------------------------------------------------------
-             */
-            if (opts->do_nans) {
-                isnan1 = HDisnan(temp1_float);
-                isnan2 = HDisnan(temp2_float);
-            }
+    * -d and -p
+    *-------------------------------------------------------------------------
+    */
+    else if (opts->delta_bool && opts->percent_bool) {
+        /*-------------------------------------------------------------------------
+         * detect NaNs
+         *-------------------------------------------------------------------------
+         */
+        if (opts->do_nans) {
+            isnan1 = HDisnan(temp1_float);
+            isnan2 = HDisnan(temp2_float);
+        }
 
-            /* both not NaN, do the comparison */
-            if (!isnan1 && !isnan2) {
-                PER(temp1_float, temp2_float);
+        /* both not NaN, do the comparison */
+        if (!isnan1 && !isnan2) {
+            PER(temp1_float, temp2_float);
 
-                if (not_comparable && !both_zero) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(F_FORMAT_P_NOTCOMP, (double) temp1_float, (double) temp2_float, (double) ABS(temp1_float - temp2_float));
-                    }
-                    nfound++;
-                }
-                else if (per > opts->percent && (double) ABS(temp1_float - temp2_float) > opts->delta) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(F_FORMAT_P, (double) temp1_float, (double) temp2_float,
-                                (double) ABS(temp1_float - temp2_float), (double) ABS(1 - temp2_float / temp1_float));
-                    }
-                    nfound++;
+            if (not_comparable && !both_zero) {
+                opts->print_percentage = 1;
+                print_pos(opts, elem_idx, -1);
+                if (print_data(opts)) {
+                    parallel_print(F_FORMAT_P_NOTCOMP, (double) temp1_float, (double) temp2_float, (double) ABS(temp1_float - temp2_float));
                 }
-
+                nfound++;
             }
-            /* only one is NaN, assume difference */
-            else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
+            else if (per > opts->percent && (double) ABS(temp1_float - temp2_float) > opts->delta) {
+                opts->print_percentage = 1;
+                print_pos(opts, elem_idx, -1);
                 if (print_data(opts)) {
-                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(F_FORMAT, (double) temp1_float, (double) temp2_float, (double) ABS(temp1_float - temp2_float));
+                    parallel_print(F_FORMAT_P, (double) temp1_float, (double) temp2_float,
+                            (double) ABS(temp1_float - temp2_float), (double) ABS(1 - temp2_float / temp1_float));
                 }
                 nfound++;
-
             }
-            mem1 += sizeof(float);
-            mem2 += sizeof(float);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
-        } /* i */
+        }
+        /* only one is NaN, assume difference */
+        else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
+            opts->print_percentage = 0;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(F_FORMAT, (double) temp1_float, (double) temp2_float, (double) ABS(temp1_float - temp2_float));
+            }
+            nfound++;
+        }
     }
-
     /*-------------------------------------------------------------------------
-     * no -d and -p
-     *-------------------------------------------------------------------------
-     */
+    * no -d and -p
+    *-------------------------------------------------------------------------
+    */
     else {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_float, mem1, sizeof(float));
-            HDmemcpy(&temp2_float, mem2, sizeof(float));
-
-            if (equal_float(temp1_float, temp2_float, opts) == FALSE) {
-                if (print_data(opts)) {
-                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(F_FORMAT, (double) temp1_float, (double) temp2_float, (double) ABS(temp1_float - temp2_float));
-                }
-                nfound++;
+        if (equal_float(temp1_float, temp2_float, opts) == FALSE) {
+            opts->print_percentage = 0;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(F_FORMAT, (double) temp1_float, (double) temp2_float, (double) ABS(temp1_float - temp2_float));
             }
-
-            mem1 += sizeof(float);
-            mem2 += sizeof(float);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
-        } /* nelmts */
+            nfound++;
+        }
     }
 
+    H5TOOLS_ENDDEBUG(": %d zero:%d", nfound, both_zero);
     return nfound;
 }
 
 /*-------------------------------------------------------------------------
- * Function: diff_double
+ * Function: diff_double_element
  *
- * Purpose:  diff a H5T_NATIVE_DOUBLE type
+ * Purpose:  diff a single H5T_NATIVE_DOUBLE type
  *
  * Return:   number of differences found
  *-------------------------------------------------------------------------
  */
-static hsize_t diff_double(unsigned char *mem1, unsigned char *mem2,
-        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
-        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
-        const char *obj2, int *ph)
-
+static hsize_t diff_double_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, diff_opt_t *opts)
 {
     hsize_t nfound = 0; /* number of differences found */
     double  temp1_double;
     double  temp2_double;
-    hsize_t i;
     double  per;
-    hbool_t both_zero;
+    hbool_t both_zero = FALSE;
     hbool_t isnan1 = FALSE;
     hbool_t isnan2 = FALSE;
 
-    /*-------------------------------------------------------------------------
-     * -d and !-p
-     *-------------------------------------------------------------------------
-     */
+    H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool);
 
-    if (opts->d && !opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_double, mem1, sizeof(double));
-            HDmemcpy(&temp2_double, mem2, sizeof(double));
+    HDmemcpy(&temp1_double, mem1, sizeof(double));
+    HDmemcpy(&temp2_double, mem2, sizeof(double));
 
-            /*-------------------------------------------------------------------------
-             * detect NaNs
-             *-------------------------------------------------------------------------
-             */
-            if (opts->do_nans) {
-                isnan1 = HDisnan(temp1_double);
-                isnan2 = HDisnan(temp2_double);
-            }
+    /*-------------------------------------------------------------------------
+    * -d and !-p
+    *-------------------------------------------------------------------------
+    */
+    if (opts->delta_bool && !opts->percent_bool) {
+        /*-------------------------------------------------------------------------
+        * detect NaNs
+        *-------------------------------------------------------------------------
+        */
+        if (opts->do_nans) {
+            isnan1 = HDisnan(temp1_double);
+            isnan2 = HDisnan(temp2_double);
+        }
 
-            /* both not NaN, do the comparison */
-            if (!isnan1 && !isnan2) {
-                if (ABS(temp1_double-temp2_double) > opts->delta) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
-                    }
-                    nfound++;
-                }
-            }
-            /* only one is NaN, assume difference */
-            else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
+        /* both not NaN, do the comparison */
+        if (!isnan1 && !isnan2) {
+            if (ABS(temp1_double-temp2_double) > opts->delta) {
+                opts->print_percentage = 0;
+                print_pos(opts, elem_idx, -1);
                 if (print_data(opts)) {
-                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
                     parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
                 }
                 nfound++;
-
             }
-            mem1 += sizeof(double);
-            mem2 += sizeof(double);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
-        } /* i */
+        }
+        /* only one is NaN, assume difference */
+        else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
+            opts->print_percentage = 0;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
+            }
+            nfound++;
+        }
     }
 
     /*-------------------------------------------------------------------------
-     * !-d and -p
-     *-------------------------------------------------------------------------
-     */
-    else if (!opts->d && opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_double, mem1, sizeof(double));
-            HDmemcpy(&temp2_double, mem2, sizeof(double));
-
-            /*-------------------------------------------------------------------------
-             * detect NaNs
-             *-------------------------------------------------------------------------
-             */
-            if (opts->do_nans) {
-                isnan1 = HDisnan(temp1_double);
-                isnan2 = HDisnan(temp2_double);
-            }
-            /* both not NaN, do the comparison */
-            if (!isnan1 && !isnan2) {
-                PER(temp1_double, temp2_double);
+    * !-d and -p
+    *-------------------------------------------------------------------------
+    */
+    else if (!opts->delta_bool && opts->percent_bool) {
+        /*-------------------------------------------------------------------------
+        * detect NaNs
+        *-------------------------------------------------------------------------
+        */
+        if (opts->do_nans) {
+            isnan1 = HDisnan(temp1_double);
+            isnan2 = HDisnan(temp2_double);
+        }
+        /* both not NaN, do the comparison */
+        if (!isnan1 && !isnan2) {
+            PER(temp1_double, temp2_double);
 
-                if (not_comparable && !both_zero) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(F_FORMAT_P_NOTCOMP, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
-                    }
-                    nfound++;
-                }
-                else if (per > opts->percent) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(F_FORMAT_P, temp1_double, temp2_double,
-                                ABS(temp1_double - temp2_double), ABS(1 - temp2_double / temp1_double));
-                    }
-                    nfound++;
+            if (not_comparable && !both_zero) {
+                opts->print_percentage = 1;
+                print_pos(opts, elem_idx, -1);
+                if (print_data(opts)) {
+                    parallel_print(F_FORMAT_P_NOTCOMP, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
                 }
+                nfound++;
             }
-            /* only one is NaN, assume difference */
-            else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
+            else if (per > opts->percent) {
+                opts->print_percentage = 1;
+                print_pos(opts, elem_idx, -1);
                 if (print_data(opts)) {
-                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
+                    parallel_print(F_FORMAT_P, temp1_double, temp2_double,
+                            ABS(temp1_double - temp2_double), ABS(1 - temp2_double / temp1_double));
                 }
                 nfound++;
-
             }
-            mem1 += sizeof(double);
-            mem2 += sizeof(double);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
-        } /* i */
+        }
+        /* only one is NaN, assume difference */
+        else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
+            opts->print_percentage = 0;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
+            }
+            nfound++;
+        }
     }
     /*-------------------------------------------------------------------------
-     * -d and -p
-     *-------------------------------------------------------------------------
-     */
-    else if (opts->d && opts->p) {
-
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_double, mem1, sizeof(double));
-            HDmemcpy(&temp2_double, mem2, sizeof(double));
-
-            /*-------------------------------------------------------------------------
-             * detect NaNs
-             *-------------------------------------------------------------------------
-             */
-            if (opts->do_nans) {
-                isnan1 = HDisnan(temp1_double);
-                isnan2 = HDisnan(temp2_double);
-            }
+    * -d and -p
+    *-------------------------------------------------------------------------
+    */
+    else if (opts->delta_bool && opts->percent_bool) {
+        /*-------------------------------------------------------------------------
+        * detect NaNs
+        *-------------------------------------------------------------------------
+        */
+        if (opts->do_nans) {
+            isnan1 = HDisnan(temp1_double);
+            isnan2 = HDisnan(temp2_double);
+        }
 
-            /* both not NaN, do the comparison */
-            if (!isnan1 && !isnan2) {
-                PER(temp1_double, temp2_double);
+        /* both not NaN, do the comparison */
+        if (!isnan1 && !isnan2) {
+            PER(temp1_double, temp2_double);
 
-                if (not_comparable && !both_zero)  {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(F_FORMAT_P_NOTCOMP, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
-                    }
-                    nfound++;
-                }
-                else if (per > opts->percent && ABS(temp1_double-temp2_double) > opts->delta) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(F_FORMAT_P, temp1_double, temp2_double,
-                                ABS(temp1_double - temp2_double), ABS(1 - temp2_double / temp1_double));
-                    }
-                    nfound++;
+            if (not_comparable && !both_zero)  {
+                opts->print_percentage = 1;
+                print_pos(opts, elem_idx, -1);
+                if (print_data(opts)) {
+                    parallel_print(F_FORMAT_P_NOTCOMP, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
                 }
+                nfound++;
             }
-            /* only one is NaN, assume difference */
-            else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
+            else if (per > opts->percent && ABS(temp1_double-temp2_double) > opts->delta) {
+                opts->print_percentage = 1;
+                print_pos(opts, elem_idx, -1);
                 if (print_data(opts)) {
-                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
+                    parallel_print(F_FORMAT_P, temp1_double, temp2_double,
+                            ABS(temp1_double - temp2_double), ABS(1 - temp2_double / temp1_double));
                 }
                 nfound++;
             }
-            mem1 += sizeof(double);
-            mem2 += sizeof(double);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
-        } /* i */
+        }
+        /* only one is NaN, assume difference */
+        else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
+            opts->print_percentage = 0;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
+            }
+            nfound++;
+        }
     }
     /*-------------------------------------------------------------------------
-     * no -d and -p
-     *-------------------------------------------------------------------------
-     */
+    * no -d and -p
+    *-------------------------------------------------------------------------
+    */
     else {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_double, mem1, sizeof(double));
-            HDmemcpy(&temp2_double, mem2, sizeof(double));
-
-            if (equal_double(temp1_double, temp2_double, opts) == FALSE) {
-                if (print_data(opts)) {
-                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
-                }
-                nfound++;
+        if (equal_double(temp1_double, temp2_double, opts) == FALSE) {
+            opts->print_percentage = 0;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
             }
-
-            mem1 += sizeof(double);
-            mem2 += sizeof(double);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
-        } /* nelmts */
+            nfound++;
+        }
     }
+    H5TOOLS_ENDDEBUG(":%d - errstat:%d", nfound, opts->err_stat);
 
     return nfound;
 }
 
 /*-------------------------------------------------------------------------
- * Function: diff_ldouble
+ * Function: diff_ldouble_element
  *
- * Purpose:  diff a H5T_NATIVE_LDOUBLE type
+ * Purpose:  diff a single H5T_NATIVE_LDOUBLE type
  *
  * Return:   number of differences found
  *-------------------------------------------------------------------------
  */
 #if H5_SIZEOF_LONG_DOUBLE !=0
 
-static hsize_t diff_ldouble(unsigned char *mem1,
-        unsigned char *mem2,
-        hsize_t nelmts,
-        hsize_t hyper_start,
-        int rank,
-        hsize_t *dims,
-        hsize_t *acc,
-        hsize_t *pos,
-        diff_opt_t *opts,
-        const char *obj1,
-        const char *obj2,
-        int *ph)
-
+static hsize_t diff_ldouble_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, diff_opt_t *opts)
 {
     hsize_t     nfound = 0; /* number of differences found */
     long double temp1_double;
     long double temp2_double;
-    hsize_t     i;
     double      per;
-    hbool_t     both_zero;
+    hbool_t     both_zero = FALSE;
     hbool_t     isnan1 = FALSE;
     hbool_t     isnan2 = FALSE;
 
+    H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool);
+
+    HDmemcpy(&temp1_double, mem1, sizeof(long double));
+    HDmemcpy(&temp2_double, mem2, sizeof(long double));
+
+    /* logic for detecting NaNs is different with options -d, -p and no options */
+
     /*-------------------------------------------------------------------------
      * -d and !-p
      *-------------------------------------------------------------------------
      */
+    if (opts->delta_bool && !opts->percent_bool) {
+        /*-------------------------------------------------------------------------
+         * detect NaNs
+         *-------------------------------------------------------------------------
+         */
+        if (opts->do_nans) {
+            isnan1 = HDisnan(temp1_double);
+            isnan2 = HDisnan(temp2_double);
+        }
 
-    if (opts->d && !opts->p) {
-        for ( i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_double, mem1, sizeof(long double));
-            HDmemcpy(&temp2_double, mem2, sizeof(long double));
-
-            /*-------------------------------------------------------------------------
-             * detect NaNs
-             *-------------------------------------------------------------------------
-             */
-            if (opts->do_nans) {
-                isnan1 = HDisnan(temp1_double);
-                isnan2 = HDisnan(temp2_double);
-            }
-
-            /* both not NaN, do the comparison */
-            if (!isnan1 && !isnan2) {
-                if (ABS(temp1_double-temp2_double) > opts->delta) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
-                    }
-                    nfound++;
-                }
-            }
-            /* only one is NaN, assume difference */
-            else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
+        /* both not NaN, do the comparison */
+        if (!isnan1 && !isnan2) {
+            if (ABS(temp1_double-temp2_double) > opts->delta) {
+                opts->print_percentage = 0;
+                print_pos(opts, elem_idx, -1);
                 if (print_data(opts)) {
-                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
+                    parallel_print(LD_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
                 }
                 nfound++;
-
             }
-            mem1 += sizeof(long double);
-            mem2 += sizeof(long double);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
-        } /* i */
+        } /* NaN */
+        /* only one is NaN, assume difference */
+        else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
+            opts->print_percentage = 0;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
+            }
+            nfound++;
+        }
     }
-
     /*-------------------------------------------------------------------------
      * !-d and -p
      *-------------------------------------------------------------------------
      */
-    else if (!opts->d && opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_double, mem1, sizeof(long double));
-            HDmemcpy(&temp2_double, mem2, sizeof(long double));
+    else if (!opts->delta_bool && opts->percent_bool) {
+        /*-------------------------------------------------------------------------
+         * detect NaNs
+         *-------------------------------------------------------------------------
+         */
+        if (opts->do_nans) {
+            isnan1 = HDisnan(temp1_double);
+            isnan2 = HDisnan(temp2_double);
+        }
 
-            /*-------------------------------------------------------------------------
-             * detect NaNs
-             *-------------------------------------------------------------------------
-             */
-            if (opts->do_nans) {
-                isnan1 = HDisnan(temp1_double);
-                isnan2 = HDisnan(temp2_double);
-            }
-            /* both not NaN, do the comparison */
-            if (!isnan1 && !isnan2) {
-                PER(temp1_double, temp2_double);
+        /* both not NaN, do the comparison */
+        if (!isnan1 && !isnan2) {
+            PER(temp1_double,temp2_double);
 
-                if (not_comparable && !both_zero) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(F_FORMAT_P_NOTCOMP, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
-                    }
-                    nfound++;
-                }
-                else if (per > opts->percent) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(F_FORMAT_P, temp1_double, temp2_double,
-                                ABS(temp1_double - temp2_double), ABS(1-temp2_double / temp1_double));
-                    }
-                    nfound++;
+            if (not_comparable && !both_zero) {
+                opts->print_percentage = 1;
+                print_pos(opts, elem_idx, -1);
+                if (print_data(opts)) {
+                    parallel_print(LD_FORMAT_P_NOTCOMP, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
                 }
+                nfound++;
             }
-            /* only one is NaN, assume difference */
-            else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
+            else if (per > opts->percent) {
+                opts->print_percentage = 1;
+                print_pos(opts, elem_idx, -1);
                 if (print_data(opts)) {
-                    print_pos(ph, 0, hyper_start+i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
+                    parallel_print(LD_FORMAT_P, temp1_double, temp2_double, ABS(temp1_double - temp2_double), ABS(1 - temp2_double / temp1_double));
                 }
                 nfound++;
             }
-            mem1 += sizeof(long double);
-            mem2 += sizeof(long double);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
-        } /* i */
+        } /* NaN */
+        /* only one is NaN, assume difference */
+        else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
+            opts->print_percentage = 0;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
+            }
+            nfound++;
+        }
     }
     /*-------------------------------------------------------------------------
      * -d and -p
      *-------------------------------------------------------------------------
      */
-    else if (opts->d && opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_double, mem1, sizeof(long double));
-            HDmemcpy(&temp2_double, mem2, sizeof(long double));
-
-            /*-------------------------------------------------------------------------
-             * detect NaNs
-             *-------------------------------------------------------------------------
-             */
-            if (opts->do_nans) {
-                isnan1 = HDisnan(temp1_double);
-                isnan2 = HDisnan(temp2_double);
-            }
+    else if (opts->delta_bool && opts->percent_bool) {
+        /*-------------------------------------------------------------------------
+         * detect NaNs
+         *-------------------------------------------------------------------------
+         */
+        if (opts->do_nans) {
+            isnan1 = HDisnan(temp1_double);
+            isnan2 = HDisnan(temp2_double);
+        }
 
-            /* both not NaN, do the comparison */
-            if (!isnan1 && !isnan2) {
-                PER(temp1_double, temp2_double);
+        /* both not NaN, do the comparison */
+        if (!isnan1 && !isnan2) {
+            PER(temp1_double,temp2_double);
 
-                if (not_comparable && !both_zero) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(F_FORMAT_P_NOTCOMP, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
-                    }
-                    nfound++;
-                }
-                else if (per > opts->percent && ABS(temp1_double - temp2_double) > opts->delta) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(F_FORMAT_P, temp1_double, temp2_double, ABS(temp1_double - temp2_double), ABS(1-temp2_double / temp1_double));
-                    }
-                    nfound++;
+            if (not_comparable && !both_zero) {
+                opts->print_percentage = 1;
+                print_pos(opts, elem_idx, -1);
+                if (print_data(opts)) {
+                    parallel_print(LD_FORMAT_P_NOTCOMP, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
                 }
+                nfound++;
             }
-            /* only one is NaN, assume difference */
-            else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
-                if (print_data(opts))  {
-                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
+            else if (per > opts->percent && ABS(temp1_double-temp2_double) > opts->delta) {
+                opts->print_percentage = 1;
+                print_pos(opts, elem_idx, -1);
+                if (print_data(opts)) {
+                    parallel_print(LD_FORMAT_P, temp1_double, temp2_double, ABS(temp1_double - temp2_double), ABS(1 - temp2_double / temp1_double));
                 }
                 nfound++;
             }
-            mem1 += sizeof(long double);
-            mem2 += sizeof(long double);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
-        } /* i */
+        } /* NaN */
+        /* only one is NaN, assume difference */
+        else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
+            opts->print_percentage = 0;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
+            }
+            nfound++;
+        }
     }
     /*-------------------------------------------------------------------------
      * no -d and -p
      *-------------------------------------------------------------------------
      */
-    else {
-        for (i = 0; i < nelmts; i++)  {
-            HDmemcpy(&temp1_double, mem1, sizeof(long double));
-            HDmemcpy(&temp2_double, mem2, sizeof(long double));
-
-            if (equal_ldouble(temp1_double, temp2_double, opts) == FALSE) {
-                if (print_data(opts)) {
-                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
-                }
-                nfound++;
-            }
-            mem1 += sizeof(long double);
-            mem2 += sizeof(long double);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
-        } /* nelmts */
+    else if (equal_ldouble(temp1_double, temp2_double, opts) == FALSE) {
+        opts->print_percentage = 0;
+        print_pos(opts, elem_idx, -1);
+        if (print_data(opts)) {
+            parallel_print(LD_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
+        }
+        nfound++;
     }
 
+    H5TOOLS_ENDDEBUG(":%d - errstat:%d", nfound, opts->err_stat);
+
     return nfound;
 }
 #endif /* H5_SIZEOF_LONG_DOUBLE */
 
 /*-------------------------------------------------------------------------
- * Function: diff_schar
+ * Function: diff_schar_element
  *
- * Purpose:  diff a H5T_NATIVE_SCHAR type
+ * Purpose:  diff a single H5T_NATIVE_SCHAR type
  *
  * Return:   number of differences found
  *-------------------------------------------------------------------------
  */
-static hsize_t diff_schar(unsigned char *mem1, unsigned char *mem2,
-        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
-        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
-        const char *obj2, int *ph)
-
+static hsize_t diff_schar_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, diff_opt_t *opts)
 {
     hsize_t nfound = 0; /* number of differences found */
     char    temp1_char;
     char    temp2_char;
-    hsize_t i;
     double  per;
-    hbool_t both_zero;
+    hbool_t both_zero = FALSE;
 
-    /* -d and !-p */
-    if (opts->d && !opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_char, mem1, sizeof(char));
-            HDmemcpy(&temp2_char, mem2, sizeof(char));
+    H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool);
+    HDmemcpy(&temp1_char, mem1, sizeof(char));
+    HDmemcpy(&temp2_char, mem2, sizeof(char));
 
-            if (ABS(temp1_char-temp2_char) > opts->delta) {
-                if (print_data(opts)) {
-                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT, temp1_char, temp2_char, ABS(temp1_char - temp2_char));
-                }
-                nfound++;
+    /* -d and !-p */
+    if (opts->delta_bool && !opts->percent_bool) {
+        if (ABS(temp1_char-temp2_char) > opts->delta) {
+            opts->print_percentage = 0;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(I_FORMAT, temp1_char, temp2_char, ABS(temp1_char - temp2_char));
             }
-            mem1 += sizeof(char);
-            mem2 += sizeof(char);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
+            nfound++;
         }
     }
     /* !-d and -p */
-    else if (!opts->d && opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_char, mem1, sizeof(char));
-            HDmemcpy(&temp2_char, mem2, sizeof(char));
+    else if (!opts->delta_bool && opts->percent_bool) {
+        PER(temp1_char, temp2_char);
 
-            PER(temp1_char, temp2_char);
-
-            if (not_comparable && !both_zero) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P_NOTCOMP, temp1_char, temp2_char, ABS(temp1_char - temp2_char));
-                }
-                nfound++;
+        if (not_comparable && !both_zero) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(I_FORMAT_P_NOTCOMP, temp1_char, temp2_char, ABS(temp1_char - temp2_char));
             }
-            else if (per > opts->percent) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P, temp1_char, temp2_char, ABS(temp1_char - temp2_char), per);
-                }
-                nfound++;
+            nfound++;
+        }
+        else if (per > opts->percent) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(I_FORMAT_P, temp1_char, temp2_char, ABS(temp1_char - temp2_char), per);
             }
-            mem1 += sizeof(char);
-            mem2 += sizeof(char);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
+            nfound++;
         }
     }
     /* -d and -p */
-    else if (opts->d && opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_char, mem1, sizeof(char));
-            HDmemcpy(&temp2_char, mem2, sizeof(char));
+    else if (opts->delta_bool && opts->percent_bool) {
+        PER(temp1_char, temp2_char);
 
-            PER(temp1_char, temp2_char);
-
-            if (not_comparable && !both_zero) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P_NOTCOMP, temp1_char, temp2_char, ABS(temp1_char - temp2_char));
-                }
-                nfound++;
+        if (not_comparable && !both_zero) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(I_FORMAT_P_NOTCOMP, temp1_char, temp2_char, ABS(temp1_char - temp2_char));
             }
-            else if (per > opts->percent && ABS(temp1_char-temp2_char) > opts->delta) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P, temp1_char, temp2_char, ABS(temp1_char - temp2_char), per);
-                }
-                nfound++;
+            nfound++;
+        }
+        else if (per > opts->percent && ABS(temp1_char - temp2_char) > opts->delta) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(I_FORMAT_P, temp1_char, temp2_char, ABS(temp1_char - temp2_char), per);
             }
-            mem1 += sizeof(char);
-            mem2 += sizeof(char);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
+            nfound++;
         }
     }
-    else {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_char, mem1, sizeof(char));
-            HDmemcpy(&temp2_char, mem2, sizeof(char));
-
-            if (temp1_char != temp2_char) {
-                if (print_data(opts)) {
-                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT, temp1_char, temp2_char, ABS(temp1_char - temp2_char));
-                }
-                nfound++;
-            }
-
-            mem1 += sizeof(char);
-            mem2 += sizeof(char);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
-        } /* nelmts */
+    else if (temp1_char != temp2_char) {
+        opts->print_percentage = 0;
+        print_pos(opts, elem_idx, -1);
+        if (print_data(opts)) {
+            parallel_print(I_FORMAT, temp1_char, temp2_char, ABS(temp1_char - temp2_char));
+        }
+        nfound++;
     }
 
+    H5TOOLS_ENDDEBUG(":%d - errstat:%d", nfound, opts->err_stat);
+
     return nfound;
 }
 
 /*-------------------------------------------------------------------------
- * Function: diff_uchar
+ * Function: diff_uchar_element
  *
- * Purpose:  diff a H5T_NATIVE_UCHAR type
+ * Purpose:  diff a single H5T_NATIVE_UCHAR type
  *
  * Return:   number of differences found
  *-------------------------------------------------------------------------
  */
-static hsize_t diff_uchar(unsigned char *mem1, unsigned char *mem2,
-        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
-        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
-        const char *obj2, int *ph)
+static hsize_t diff_uchar_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, diff_opt_t *opts)
 {
     hsize_t       nfound = 0; /* number of differences found */
     unsigned char temp1_uchar;
     unsigned char temp2_uchar;
-    hsize_t       i;
     double        per;
-    hbool_t       both_zero;
+    hbool_t       both_zero = FALSE;
 
-    /* -d and !-p */
-    if (opts->d && !opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_uchar, mem1, sizeof(unsigned char));
-            HDmemcpy(&temp2_uchar, mem2, sizeof(unsigned char));
+    H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool);
 
-            if (PDIFF(temp1_uchar,temp2_uchar) > opts->delta) {
-                if (print_data(opts)) {
-                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar));
-                }
-                nfound++;
+    HDmemcpy(&temp1_uchar, mem1, sizeof(unsigned char));
+    HDmemcpy(&temp2_uchar, mem2, sizeof(unsigned char));
+    /* -d and !-p */
+    if (opts->delta_bool && !opts->percent_bool) {
+        if (PDIFF(temp1_uchar, temp2_uchar) > opts->delta) {
+            opts->print_percentage = 0;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(I_FORMAT, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar));
             }
-            mem1 += sizeof(unsigned char);
-            mem2 += sizeof(unsigned char);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
+            nfound++;
         }
     }
     /* !-d and -p */
-    else if (!opts->d && opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_uchar, mem1, sizeof(unsigned char));
-            HDmemcpy(&temp2_uchar, mem2, sizeof(unsigned char));
-
-            PER_UNSIGN(signed char, temp1_uchar, temp2_uchar);
+    else if (!opts->delta_bool && opts->percent_bool) {
+        PER_UNSIGN(signed char, temp1_uchar, temp2_uchar);
 
-            if (not_comparable && !both_zero) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P_NOTCOMP, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar));
-                }
-                nfound++;
+        if (not_comparable && !both_zero) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(I_FORMAT_P_NOTCOMP, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar));
             }
-            else if (per > opts->percent) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar), per);
-                }
-                nfound++;
+            nfound++;
+        }
+        else if (per > opts->percent) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(I_FORMAT_P, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar), per);
             }
-            mem1 += sizeof(unsigned char);
-            mem2 += sizeof(unsigned char);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
+            nfound++;
         }
     }
     /* -d and -p */
-    else if (opts->d && opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_uchar, mem1, sizeof(unsigned char));
-            HDmemcpy(&temp2_uchar, mem2, sizeof(unsigned char));
-
-            PER_UNSIGN(signed char, temp1_uchar, temp2_uchar);
+    else if (opts->delta_bool && opts->percent_bool) {
+        PER_UNSIGN(signed char, temp1_uchar, temp2_uchar);
 
-            if (not_comparable && !both_zero) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P_NOTCOMP, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar));
-                }
-                nfound++;
+        if (not_comparable && !both_zero) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(I_FORMAT_P_NOTCOMP, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar));
             }
-            else if (per > opts->percent && PDIFF(temp1_uchar,temp2_uchar) > opts->delta) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar), per);
-                }
-                nfound++;
+            nfound++;
+        }
+        else if (per > opts->percent && PDIFF(temp1_uchar, temp2_uchar) > opts->delta) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(I_FORMAT_P, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar), per);
             }
-            mem1 += sizeof(unsigned char);
-            mem2 += sizeof(unsigned char);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
+            nfound++;
         }
     }
-    else {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_uchar, mem1, sizeof(unsigned char));
-            HDmemcpy(&temp2_uchar, mem2, sizeof(unsigned char));
-
-            if (temp1_uchar != temp2_uchar) {
-                if (print_data(opts)) {
-                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar));
-                }
-                nfound++;
-            }
-
-            mem1 += sizeof(unsigned char);
-            mem2 += sizeof(unsigned char);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
-        } /* nelmts */
+    else if (temp1_uchar != temp2_uchar) {
+        opts->print_percentage = 0;
+        print_pos(opts, elem_idx, -1);
+        if (print_data(opts)) {
+            parallel_print(I_FORMAT, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar));
+        }
+        nfound++;
     }
 
+    H5TOOLS_ENDDEBUG(":%d - errstat:%d", nfound, opts->err_stat);
+
     return nfound;
 }
 
 /*-------------------------------------------------------------------------
- * Function: diff_short
+ * Function: diff_short_element
  *
  * Purpose:  diff a H5T_NATIVE_SHORT type
  *
  * Return:   number of differences found
  *-------------------------------------------------------------------------
  */
-static hsize_t diff_short(unsigned char *mem1, unsigned char *mem2,
-        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
-        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
-        const char *obj2, int *ph)
+static hsize_t diff_short_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, diff_opt_t *opts)
 {
     hsize_t nfound = 0; /* number of differences found */
     short   temp1_short;
     short   temp2_short;
-    hsize_t i;
     double  per;
-    hbool_t both_zero;
+    hbool_t both_zero = FALSE;
 
-    /* -d and !-p */
-    if (opts->d && !opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_short, mem1, sizeof(short));
-            HDmemcpy(&temp2_short, mem2, sizeof(short));
+    H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool);
 
-            if (ABS(temp1_short-temp2_short) > opts->delta) {
-                if (print_data(opts)) {
-                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT, temp1_short, temp2_short, ABS(temp1_short - temp2_short));
-                }
-                nfound++;
+    HDmemcpy(&temp1_short, mem1, sizeof(short));
+    HDmemcpy(&temp2_short, mem2, sizeof(short));
+    /* -d and !-p */
+    if (opts->delta_bool && !opts->percent_bool) {
+        if (ABS(temp1_short - temp2_short) > opts->delta) {
+            opts->print_percentage = 0;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(I_FORMAT, temp1_short, temp2_short, ABS(temp1_short - temp2_short));
             }
-            mem1 += sizeof(short);
-            mem2 += sizeof(short);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
+            nfound++;
         }
     }
     /* !-d and -p */
-    else if (!opts->d && opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_short, mem1, sizeof(short));
-            HDmemcpy(&temp2_short, mem2, sizeof(short));
-
-            PER(temp1_short, temp2_short);
+    else if (!opts->delta_bool && opts->percent_bool) {
+        PER(temp1_short, temp2_short);
 
-            if (not_comparable && !both_zero) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P_NOTCOMP, temp1_short, temp2_short, ABS(temp1_short - temp2_short));
-                }
-                nfound++;
+        if (not_comparable && !both_zero) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(I_FORMAT_P_NOTCOMP, temp1_short, temp2_short, ABS(temp1_short - temp2_short));
             }
-            else if (per > opts->percent) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P, temp1_short, temp2_short, ABS(temp1_short - temp2_short), per);
-                }
-                nfound++;
+            nfound++;
+        }
+        else if (per > opts->percent) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(I_FORMAT_P, temp1_short, temp2_short, ABS(temp1_short - temp2_short), per);
             }
-            mem1 += sizeof(short);
-            mem2 += sizeof(short);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
+            nfound++;
         }
     }
     /* -d and -p */
-    else if (opts->d && opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_short, mem1, sizeof(short));
-            HDmemcpy(&temp2_short, mem2, sizeof(short));
-
-            PER(temp1_short, temp2_short);
+    else if (opts->delta_bool && opts->percent_bool) {
+        PER(temp1_short, temp2_short);
 
-            if (not_comparable && !both_zero) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P_NOTCOMP, temp1_short, temp2_short, ABS(temp1_short - temp2_short));
-                }
-                nfound++;
+        if (not_comparable && !both_zero) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(I_FORMAT_P_NOTCOMP, temp1_short, temp2_short, ABS(temp1_short - temp2_short));
             }
-            else if (per > opts->percent && ABS(temp1_short-temp2_short) > opts->delta) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P, temp1_short, temp2_short, ABS(temp1_short - temp2_short), per);
-                }
-                nfound++;
+            nfound++;
+        }
+        else if (per > opts->percent && ABS(temp1_short - temp2_short) > opts->delta) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(I_FORMAT_P, temp1_short, temp2_short, ABS(temp1_short - temp2_short), per);
             }
-            mem1 += sizeof(short);
-            mem2 += sizeof(short);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
+            nfound++;
         }
     }
-    else {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_short, mem1, sizeof(short));
-            HDmemcpy(&temp2_short, mem2, sizeof(short));
-
-            if (temp1_short != temp2_short) {
-                if (print_data(opts)) {
-                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT, temp1_short, temp2_short, ABS(temp1_short - temp2_short));
-                }
-                nfound++;
-            }
-
-            mem1 += sizeof(short);
-            mem2 += sizeof(short);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
-        } /* nelmts */
+    else if (temp1_short != temp2_short) {
+        opts->print_percentage = 0;
+        print_pos(opts, elem_idx, -1);
+        if (print_data(opts)) {
+            parallel_print(I_FORMAT, temp1_short, temp2_short, ABS(temp1_short - temp2_short));
+        }
+        nfound++;
     }
 
+    H5TOOLS_ENDDEBUG(":%d - errstat:%d", nfound, opts->err_stat);
+
     return nfound;
 }
 
 /*-------------------------------------------------------------------------
- * Function: diff_ushort
+ * Function: diff_ushort_element
  *
- * Purpose:  diff a H5T_NATIVE_USHORT type
+ * Purpose:  diff a single H5T_NATIVE_USHORT type
  *
  * Return:   number of differences found
  *-------------------------------------------------------------------------
  */
-static hsize_t diff_ushort(unsigned char *mem1, unsigned char *mem2,
-        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
-        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
-        const char *obj2, int *ph)
-
+static hsize_t diff_ushort_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, diff_opt_t *opts)
 {
     hsize_t        nfound = 0; /* number of differences found */
     unsigned short temp1_ushort;
     unsigned short temp2_ushort;
-    hsize_t        i;
     double         per;
-    hbool_t        both_zero;
+    hbool_t        both_zero = FALSE;
 
-    /* -d and !-p */
-    if (opts->d && !opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_ushort, mem1, sizeof(unsigned short));
-            HDmemcpy(&temp2_ushort, mem2, sizeof(unsigned short));
+    H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool);
 
-            if (PDIFF(temp1_ushort,temp2_ushort) > opts->delta) {
-                if (print_data(opts)) {
-                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT, temp1_ushort, temp2_ushort, PDIFF(temp1_ushort, temp2_ushort));
-                }
-                nfound++;
+    HDmemcpy(&temp1_ushort, mem1, sizeof(unsigned short));
+    HDmemcpy(&temp2_ushort, mem2, sizeof(unsigned short));
+    /* -d and !-p */
+    if (opts->delta_bool && !opts->percent_bool) {
+        if (PDIFF(temp1_ushort, temp2_ushort) > opts->delta) {
+            opts->print_percentage = 0;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(I_FORMAT, temp1_ushort, temp2_ushort, PDIFF(temp1_ushort, temp2_ushort));
             }
-            mem1 += sizeof(unsigned short);
-            mem2 += sizeof(unsigned short);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
+            nfound++;
         }
     }
     /* !-d and -p */
-    else if (!opts->d && opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_ushort, mem1, sizeof(unsigned short));
-            HDmemcpy(&temp2_ushort, mem2, sizeof(unsigned short));
-
-            PER_UNSIGN(signed short, temp1_ushort, temp2_ushort);
+    else if (!opts->delta_bool && opts->percent_bool) {
+        PER_UNSIGN(signed short, temp1_ushort, temp2_ushort);
 
-            if (not_comparable && !both_zero)  {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P_NOTCOMP, temp1_ushort, temp2_ushort, PDIFF(temp1_ushort, temp2_ushort));
-                }
-                nfound++;
+        if (not_comparable && !both_zero) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(I_FORMAT_P_NOTCOMP, temp1_ushort, temp2_ushort, PDIFF(temp1_ushort, temp2_ushort));
             }
-            else if (per > opts->percent) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P, temp1_ushort, temp2_ushort, PDIFF(temp1_ushort, temp2_ushort), per);
-                }
-                nfound++;
+            nfound++;
+        }
+        else if (per > opts->percent) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(I_FORMAT_P, temp1_ushort, temp2_ushort, PDIFF(temp1_ushort, temp2_ushort), per);
             }
-            mem1 += sizeof(unsigned short);
-            mem2 += sizeof(unsigned short);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
+            nfound++;
         }
     }
     /* -d and -p */
-    else if (opts->d && opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_ushort, mem1, sizeof(unsigned short));
-            HDmemcpy(&temp2_ushort, mem2, sizeof(unsigned short));
-
-            PER_UNSIGN(signed short, temp1_ushort, temp2_ushort);
+    else if (opts->delta_bool && opts->percent_bool) {
+        PER_UNSIGN(signed short, temp1_ushort, temp2_ushort);
 
-            if (not_comparable && !both_zero) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P_NOTCOMP, temp1_ushort, temp2_ushort, PDIFF(temp1_ushort, temp2_ushort));
-                }
-                nfound++;
+        if (not_comparable && !both_zero) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(I_FORMAT_P_NOTCOMP, temp1_ushort, temp2_ushort, PDIFF(temp1_ushort, temp2_ushort));
             }
-            else if (per > opts->percent && PDIFF(temp1_ushort,temp2_ushort) > opts->delta) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P, temp1_ushort, temp2_ushort, PDIFF(temp1_ushort, temp2_ushort), per);
-                }
-                nfound++;
+            nfound++;
+        }
+        else if (per > opts->percent && PDIFF(temp1_ushort, temp2_ushort) > opts->delta) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(I_FORMAT_P, temp1_ushort, temp2_ushort, PDIFF(temp1_ushort, temp2_ushort), per);
             }
-            mem1 += sizeof(unsigned short);
-            mem2 += sizeof(unsigned short);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
+            nfound++;
         }
     }
-    else {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_ushort, mem1, sizeof(unsigned short));
-            HDmemcpy(&temp2_ushort, mem2, sizeof(unsigned short));
-
-            if (temp1_ushort != temp2_ushort) {
-                if (print_data(opts)) {
-                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT, temp1_ushort, temp2_ushort, PDIFF(temp1_ushort, temp2_ushort));
-                }
-                nfound++;
-            }
-
-            mem1 += sizeof(unsigned short);
-            mem2 += sizeof(unsigned short);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
-        } /* nelmts */
+    else if (temp1_ushort != temp2_ushort) {
+        opts->print_percentage = 0;
+        print_pos(opts, elem_idx, -1);
+        if (print_data(opts)) {
+            parallel_print(I_FORMAT, temp1_ushort, temp2_ushort, PDIFF(temp1_ushort, temp2_ushort));
+        }
+        nfound++;
     }
 
+    H5TOOLS_ENDDEBUG(":%d - errstat:%d", nfound, opts->err_stat);
+
     return nfound;
 }
 
 /*-------------------------------------------------------------------------
- * Function:  diff_int
+ * Function:  diff_int_element
  *
- * Purpose:   diff a H5T_NATIVE_INT type
+ * Purpose:   diff a single H5T_NATIVE_INT type
  *
  * Return:    number of differences found
   *-------------------------------------------------------------------------
  */
-static hsize_t diff_int(unsigned char *mem1, unsigned char *mem2,
-        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
-        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
-        const char *obj2, int *ph)
+static hsize_t diff_int_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, diff_opt_t *opts)
 {
     hsize_t nfound = 0; /* number of differences found */
     int     temp1_int;
     int     temp2_int;
-    hsize_t i;
     double  per;
-    hbool_t both_zero;
+    hbool_t both_zero = FALSE;
 
-    /* -d and !-p */
-    if (opts->d && !opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_int, mem1, sizeof(int));
-            HDmemcpy(&temp2_int, mem2, sizeof(int));
+    H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool);
 
-            if (ABS(temp1_int-temp2_int) > opts->delta) {
-                if (print_data(opts)) {
-                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT, temp1_int, temp2_int, ABS(temp1_int - temp2_int));
-                }
-                nfound++;
+    HDmemcpy(&temp1_int, mem1, sizeof(int));
+    HDmemcpy(&temp2_int, mem2, sizeof(int));
+    /* -d and !-p */
+    if (opts->delta_bool && !opts->percent_bool) {
+        if (ABS(temp1_int-temp2_int) > opts->delta) {
+            opts->print_percentage = 0;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(I_FORMAT, temp1_int, temp2_int, ABS(temp1_int - temp2_int));
             }
-            mem1 += sizeof(int);
-            mem2 += sizeof(int);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
+            nfound++;
         }
     }
     /* !-d and -p */
-    else if (!opts->d && opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_int, mem1, sizeof(int));
-            HDmemcpy(&temp2_int, mem2, sizeof(int));
-
-            PER(temp1_int, temp2_int);
+    else if (!opts->delta_bool && opts->percent_bool) {
+        PER(temp1_int, temp2_int);
 
-            if (not_comparable && !both_zero) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P_NOTCOMP, temp1_int, temp2_int, ABS(temp1_int - temp2_int));
-                }
-                nfound++;
+        if (not_comparable && !both_zero) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(I_FORMAT_P_NOTCOMP, temp1_int, temp2_int, ABS(temp1_int - temp2_int));
             }
-            else if (per > opts->percent) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P, temp1_int, temp2_int, ABS(temp1_int - temp2_int), per);
-                }
-                nfound++;
+            nfound++;
+        }
+        else if (per > opts->percent) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(I_FORMAT_P, temp1_int, temp2_int, ABS(temp1_int - temp2_int), per);
             }
-            mem1 += sizeof(int);
-            mem2 += sizeof(int);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
+            nfound++;
         }
     }
     /* -d and -p */
-    else if (opts->d && opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_int, mem1, sizeof(int));
-            HDmemcpy(&temp2_int, mem2, sizeof(int));
-
-            PER(temp1_int, temp2_int);
+    else if (opts->delta_bool && opts->percent_bool) {
+        PER(temp1_int, temp2_int);
 
-            if (not_comparable && !both_zero) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P_NOTCOMP, temp1_int, temp2_int, ABS(temp1_int - temp2_int));
-                }
-                nfound++;
+        if (not_comparable && !both_zero) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(I_FORMAT_P_NOTCOMP, temp1_int, temp2_int, ABS(temp1_int - temp2_int));
             }
-            else if (per > opts->percent && ABS(temp1_int-temp2_int) > opts->delta) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P, temp1_int, temp2_int, ABS(temp1_int - temp2_int), per);
-                }
-                nfound++;
+            nfound++;
+        }
+        else if (per > opts->percent && ABS(temp1_int - temp2_int) > opts->delta) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(I_FORMAT_P, temp1_int, temp2_int, ABS(temp1_int - temp2_int), per);
             }
-            mem1 += sizeof(int);
-            mem2 += sizeof(int);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
+            nfound++;
         }
     }
-    else {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_int, mem1, sizeof(int));
-            HDmemcpy(&temp2_int, mem2, sizeof(int));
-
-            if (temp1_int != temp2_int) {
-                if (print_data(opts)) {
-                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT, temp1_int, temp2_int, ABS(temp1_int - temp2_int));
-                }
-                nfound++;
-            }
+    else if (temp1_int != temp2_int) {
+        opts->print_percentage = 0;
+        print_pos(opts, elem_idx, -1);
+        if (print_data(opts)) {
+            parallel_print(I_FORMAT, temp1_int, temp2_int, ABS(temp1_int - temp2_int));
+        }
+        nfound++;
+    }
 
-            mem1 += sizeof(int);
-            mem2 += sizeof(int);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
-        } /* nelmts */
+    H5TOOLS_ENDDEBUG(":%d - errstat:%d", nfound, opts->err_stat);
 
-    }
     return nfound;
 }
 
 /*-------------------------------------------------------------------------
- * Function: diff_uint
+ * Function: diff_uint_element
  *
- * Purpose:  diff a H5T_NATIVE_UINT type
+ * Purpose:  diff a single H5T_NATIVE_UINT type
  *
  * Return:  number of differences found
  *-------------------------------------------------------------------------
  */
-static hsize_t diff_uint(unsigned char *mem1, unsigned char *mem2,
-        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
-        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
-        const char *obj2, int *ph)
+static hsize_t diff_uint_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, diff_opt_t *opts)
 {
     hsize_t nfound = 0; /* number of differences found */
     unsigned int temp1_uint;
     unsigned int temp2_uint;
-    hsize_t i;
     double per;
-    hbool_t both_zero;
+    hbool_t both_zero = FALSE;
 
-    /* -d and !-p */
-    if (opts->d && !opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_uint, mem1, sizeof(unsigned int));
-            HDmemcpy(&temp2_uint, mem2, sizeof(unsigned int));
+    H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool);
 
-            if (PDIFF(temp1_uint,temp2_uint) > opts->delta) {
-                if (print_data(opts)) {
-                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT, temp1_uint, temp2_uint, PDIFF(temp1_uint, temp2_uint));
-                }
-                nfound++;
+    HDmemcpy(&temp1_uint, mem1, sizeof(unsigned int));
+    HDmemcpy(&temp2_uint, mem2, sizeof(unsigned int));
+    /* -d and !-p */
+    if (opts->delta_bool && !opts->percent_bool) {
+        if (PDIFF(temp1_uint, temp2_uint) > opts->delta) {
+            opts->print_percentage = 0;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(UI_FORMAT, temp1_uint, temp2_uint, PDIFF(temp1_uint, temp2_uint));
             }
-            mem1 += sizeof(unsigned int);
-            mem2 += sizeof(unsigned int);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
+            nfound++;
         }
     }
     /* !-d and -p */
-    else if (!opts->d && opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_uint, mem1, sizeof(unsigned int));
-            HDmemcpy(&temp2_uint, mem2, sizeof(unsigned int));
+    else if (!opts->delta_bool && opts->percent_bool) {
+        PER_UNSIGN(signed int, temp1_uint, temp2_uint);
 
-            PER_UNSIGN(signed int, temp1_uint, temp2_uint);
-
-            if (not_comparable && !both_zero) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P_NOTCOMP, temp1_uint, temp2_uint, PDIFF(temp1_uint, temp2_uint));
-                }
-                nfound++;
+        if (not_comparable && !both_zero) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(UI_FORMAT_P_NOTCOMP, temp1_uint, temp2_uint, PDIFF(temp1_uint, temp2_uint));
             }
-            else if (per > opts->percent) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P, temp1_uint, temp2_uint, PDIFF(temp1_uint, temp2_uint), per);
-                }
-                nfound++;
+            nfound++;
+        }
+        else if (per > opts->percent) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(UI_FORMAT_P, temp1_uint, temp2_uint, PDIFF(temp1_uint, temp2_uint), per);
             }
-            mem1 += sizeof(unsigned int);
-            mem2 += sizeof(unsigned int);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
+            nfound++;
         }
     }
     /* -d and -p */
-    else if (opts->d && opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_uint, mem1, sizeof(unsigned int));
-            HDmemcpy(&temp2_uint, mem2, sizeof(unsigned int));
+    else if (opts->delta_bool && opts->percent_bool) {
+        PER_UNSIGN(signed int, temp1_uint, temp2_uint);
 
-            PER_UNSIGN(signed int, temp1_uint, temp2_uint);
-
-            if (not_comparable && !both_zero) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P_NOTCOMP, temp1_uint, temp2_uint, PDIFF(temp1_uint, temp2_uint));
-                }
-                nfound++;
+        if (not_comparable && !both_zero) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(UI_FORMAT_P_NOTCOMP, temp1_uint, temp2_uint, PDIFF(temp1_uint, temp2_uint));
             }
-            else if (per > opts->percent
-                    && PDIFF(temp1_uint,temp2_uint) > opts->delta) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P, temp1_uint, temp2_uint, PDIFF(temp1_uint, temp2_uint), per);
-                }
-                nfound++;
+            nfound++;
+        }
+        else if (per > opts->percent && PDIFF(temp1_uint,temp2_uint) > opts->delta) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(UI_FORMAT_P, temp1_uint, temp2_uint, PDIFF(temp1_uint, temp2_uint), per);
             }
-            mem1 += sizeof(unsigned int);
-            mem2 += sizeof(unsigned int);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
+            nfound++;
         }
     }
-    else {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_uint, mem1, sizeof(unsigned int));
-            HDmemcpy(&temp2_uint, mem2, sizeof(unsigned int));
-
-            if (temp1_uint != temp2_uint) {
-                if (print_data(opts)) {
-                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(I_FORMAT, temp1_uint, temp2_uint, PDIFF(temp1_uint, temp2_uint));
-                }
-                nfound++;
-            }
-
-            mem1 += sizeof(unsigned int);
-            mem2 += sizeof(unsigned int);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
-        } /* nelmts */
+    else if (temp1_uint != temp2_uint) {
+        opts->print_percentage = 0;
+        print_pos(opts, elem_idx, -1);
+        if (print_data(opts)) {
+            parallel_print(UI_FORMAT, temp1_uint, temp2_uint, PDIFF(temp1_uint, temp2_uint));
+        }
+        nfound++;
     }
 
+    H5TOOLS_ENDDEBUG(":%d - errstat:%d", nfound, opts->err_stat);
+
     return nfound;
 }
 
 /*-------------------------------------------------------------------------
- * Function: diff_long
+ * Function: diff_long_element
  *
- * Purpose:  diff a H5T_NATIVE_LONG type
+ * Purpose:  diff a single H5T_NATIVE_LONG type
  *
  * Return:   number of differences found
  *-------------------------------------------------------------------------
  */
-static hsize_t diff_long(unsigned char *mem1, unsigned char *mem2,
-        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
-        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
-        const char *obj2, int *ph)
+static hsize_t diff_long_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, diff_opt_t *opts)
 {
     hsize_t nfound = 0; /* number of differences found */
     long temp1_long;
     long temp2_long;
-    hsize_t i;
     double per;
-    hbool_t both_zero;
+    hbool_t both_zero = FALSE;
 
-    /* -d and !-p */
-    if (opts->d && !opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            for (i = 0; i < nelmts; i++) {
-                HDmemcpy(&temp1_long, mem1, sizeof(long));
-                HDmemcpy(&temp2_long, mem2, sizeof(long));
+    H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool);
 
-                if (ABS(temp1_long-temp2_long) > opts->delta) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(LI_FORMAT, temp1_long, temp2_long, ABS(temp1_long - temp2_long));
-                    }
-                    nfound++;
-                }
-                mem1 += sizeof(long);
-                mem2 += sizeof(long);
-                if (opts->n && nfound >= opts->count)
-                    return nfound;
+    HDmemcpy(&temp1_long, mem1, sizeof(long));
+    HDmemcpy(&temp2_long, mem2, sizeof(long));
+    /* -d and !-p */
+    if (opts->delta_bool && !opts->percent_bool) {
+        if (ABS(temp1_long-temp2_long) > opts->delta) {
+            opts->print_percentage = 0;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(LI_FORMAT, temp1_long, temp2_long, ABS(temp1_long - temp2_long));
             }
+            nfound++;
         }
     }
     /* !-d and -p */
-    else if (!opts->d && opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_long, mem1, sizeof(long));
-            HDmemcpy(&temp2_long, mem2, sizeof(long));
+    else if (!opts->delta_bool && opts->percent_bool) {
+        PER(temp1_long, temp2_long);
 
-            PER(temp1_long, temp2_long);
-
-            if (not_comparable && !both_zero) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(LI_FORMAT_P_NOTCOMP, temp1_long, temp2_long, ABS(temp1_long - temp2_long));
-                }
-                nfound++;
+        if (not_comparable && !both_zero) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(LI_FORMAT_P_NOTCOMP, temp1_long, temp2_long, ABS(temp1_long - temp2_long));
             }
-            else if (per > opts->percent) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(LI_FORMAT_P, temp1_long, temp2_long, ABS(temp1_long - temp2_long), per);
-                }
-                nfound++;
+            nfound++;
+        }
+        else if (per > opts->percent) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(LI_FORMAT_P, temp1_long, temp2_long, ABS(temp1_long - temp2_long), per);
             }
-            mem1 += sizeof(long);
-            mem2 += sizeof(long);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
+            nfound++;
         }
     }
     /* -d and -p */
-    else if (opts->d && opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_long, mem1, sizeof(long));
-            HDmemcpy(&temp2_long, mem2, sizeof(long));
+    else if (opts->delta_bool && opts->percent_bool) {
+        PER(temp1_long, temp2_long);
 
-            PER(temp1_long, temp2_long);
-
-            if (not_comparable && !both_zero) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(LI_FORMAT_P_NOTCOMP, temp1_long, temp2_long, ABS(temp1_long - temp2_long));
-                }
-                nfound++;
+        if (not_comparable && !both_zero) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(LI_FORMAT_P_NOTCOMP, temp1_long, temp2_long, ABS(temp1_long - temp2_long));
             }
-            else if (per > opts->percent && ABS(temp1_long-temp2_long) > opts->delta) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(LI_FORMAT_P, temp1_long, temp2_long, ABS(temp1_long - temp2_long), per);
-                }
-                nfound++;
+            nfound++;
+        }
+        else if (per > opts->percent && ABS(temp1_long-temp2_long) > opts->delta) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(LI_FORMAT_P, temp1_long, temp2_long, ABS(temp1_long - temp2_long), per);
             }
-            mem1 += sizeof(long);
-            mem2 += sizeof(long);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
+            nfound++;
         }
     }
-    else {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_long, mem1, sizeof(long));
-            HDmemcpy(&temp2_long, mem2, sizeof(long));
-
-            if (temp1_long != temp2_long) {
-                if (print_data(opts)) {
-                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(LI_FORMAT, temp1_long, temp2_long, ABS(temp1_long - temp2_long));
-                }
-                nfound++;
-            }
-
-            mem1 += sizeof(long);
-            mem2 += sizeof(long);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
-        } /* nelmts */
+    else if (temp1_long != temp2_long) {
+        opts->print_percentage = 0;
+        print_pos(opts, elem_idx, -1);
+        if (print_data(opts)) {
+            parallel_print(LI_FORMAT, temp1_long, temp2_long, ABS(temp1_long - temp2_long));
+        }
+        nfound++;
     }
 
+    H5TOOLS_ENDDEBUG(":%d - errstat:%d", nfound, opts->err_stat);
+
     return nfound;
 }
 
 /*-------------------------------------------------------------------------
- * Function: diff_ulong
+ * Function: diff_ulong_element
  *
- * Purpose:  diff a H5T_NATIVE_ULONG type
+ * Purpose:  diff a single H5T_NATIVE_ULONG type
  *
  * Return:   number of differences found
  *-------------------------------------------------------------------------
  */
-static hsize_t diff_ulong(unsigned char *mem1, unsigned char *mem2,
-        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
-        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
-        const char *obj2, int *ph)
+static hsize_t diff_ulong_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, diff_opt_t *opts)
 {
     hsize_t       nfound = 0; /* number of differences found */
     unsigned long temp1_ulong;
     unsigned long temp2_ulong;
-    hsize_t       i;
     double        per;
-    hbool_t       both_zero;
+    hbool_t       both_zero = FALSE;
 
-    /* -d and !-p */
-    if (opts->d && !opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            for (i = 0; i < nelmts; i++) {
-                HDmemcpy(&temp1_ulong, mem1, sizeof(unsigned long));
-                HDmemcpy(&temp2_ulong, mem2, sizeof(unsigned long));
+    H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool);
 
-                if (PDIFF(temp1_ulong,temp2_ulong) > opts->delta) {
-                    if (print_data(opts)) {
-                        print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                        parallel_print(SPACES);
-                        parallel_print(LI_FORMAT, temp1_ulong, temp2_ulong, PDIFF(temp1_ulong, temp2_ulong));
-                    }
-                    nfound++;
-                }
-                mem1 += sizeof(unsigned long);
-                mem2 += sizeof(unsigned long);
-                if (opts->n && nfound >= opts->count)
-                    return nfound;
+    HDmemcpy(&temp1_ulong, mem1, sizeof(unsigned long));
+    HDmemcpy(&temp2_ulong, mem2, sizeof(unsigned long));
+    /* -d and !-p */
+    if (opts->delta_bool && !opts->percent_bool) {
+        if (PDIFF(temp1_ulong, temp2_ulong) > opts->delta) {
+            opts->print_percentage = 0;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(ULI_FORMAT, temp1_ulong, temp2_ulong, PDIFF(temp1_ulong, temp2_ulong));
             }
+            nfound++;
         }
     }
     /* !-d and -p */
-    else if (!opts->d && opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_ulong, mem1, sizeof(unsigned long));
-            HDmemcpy(&temp2_ulong, mem2, sizeof(unsigned long));
+    else if (!opts->delta_bool && opts->percent_bool) {
+        PER_UNSIGN(signed long, temp1_ulong, temp2_ulong);
 
-            PER_UNSIGN(signed long, temp1_ulong, temp2_ulong);
-
-            if (not_comparable && !both_zero) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(ULI_FORMAT_P_NOTCOMP, temp1_ulong, temp2_ulong, PDIFF(temp1_ulong, temp2_ulong));
-                }
-                nfound++;
+        if (not_comparable && !both_zero) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(ULI_FORMAT_P_NOTCOMP, temp1_ulong, temp2_ulong, PDIFF(temp1_ulong, temp2_ulong));
             }
-            else if (per > opts->percent) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(LI_FORMAT_P, temp1_ulong, temp2_ulong, PDIFF(temp1_ulong, temp2_ulong), per);
-                }
-                nfound++;
+            nfound++;
+        }
+        else if (per > opts->percent) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(ULI_FORMAT_P, temp1_ulong, temp2_ulong, PDIFF(temp1_ulong, temp2_ulong), per);
             }
-            mem1 += sizeof(unsigned long);
-            mem2 += sizeof(unsigned long);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
+            nfound++;
         }
     }
     /* -d and -p */
-    else if (opts->d && opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_ulong, mem1, sizeof(unsigned long));
-            HDmemcpy(&temp2_ulong, mem2, sizeof(unsigned long));
+    else if (opts->delta_bool && opts->percent_bool) {
+        PER_UNSIGN(signed long, temp1_ulong, temp2_ulong);
 
-            PER_UNSIGN(signed long, temp1_ulong, temp2_ulong);
-
-            if (not_comparable && !both_zero) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(ULI_FORMAT_P_NOTCOMP, temp1_ulong, temp2_ulong, PDIFF(temp1_ulong, temp2_ulong));
-                }
-                nfound++;
+        if (not_comparable && !both_zero) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(ULI_FORMAT_P_NOTCOMP, temp1_ulong, temp2_ulong, PDIFF(temp1_ulong, temp2_ulong));
             }
-            else if (per > opts->percent
-                    && PDIFF(temp1_ulong,temp2_ulong) > opts->delta) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(LI_FORMAT_P, temp1_ulong, temp2_ulong, PDIFF(temp1_ulong, temp2_ulong), per);
-                }
-                nfound++;
+            nfound++;
+        }
+        else if (per > opts->percent && PDIFF(temp1_ulong,temp2_ulong) > opts->delta) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(ULI_FORMAT_P, temp1_ulong, temp2_ulong, PDIFF(temp1_ulong, temp2_ulong), per);
             }
-            mem1 += sizeof(unsigned long);
-            mem2 += sizeof(unsigned long);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
+            nfound++;
         }
     }
-    else {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_ulong, mem1, sizeof(unsigned long));
-            HDmemcpy(&temp2_ulong, mem2, sizeof(unsigned long));
-
-            if (temp1_ulong != temp2_ulong) {
-                if (print_data(opts)) {
-                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(LI_FORMAT, temp1_ulong, temp2_ulong, PDIFF(temp1_ulong, temp2_ulong));
-                }
-                nfound++;
-            }
-
-            mem1 += sizeof(unsigned long);
-            mem2 += sizeof(unsigned long);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
-        } /* nelmts */
+    else if (temp1_ulong != temp2_ulong) {
+        opts->print_percentage = 0;
+        print_pos(opts, elem_idx, -1);
+        if (print_data(opts)) {
+            parallel_print(ULI_FORMAT, temp1_ulong, temp2_ulong, PDIFF(temp1_ulong, temp2_ulong));
+        }
+        nfound++;
     }
 
+    H5TOOLS_ENDDEBUG(":%d - errstat:%d", nfound, opts->err_stat);
+
     return nfound;
 }
 
 /*-------------------------------------------------------------------------
- * Function: diff_llong
+ * Function: diff_llong_element
  *
- * Purpose:  diff a H5T_NATIVE_LLONG type
+ * Purpose:  diff a single H5T_NATIVE_LLONG type
  *
  * Return:   number of differences found
  *-------------------------------------------------------------------------
  */
-static hsize_t diff_llong(unsigned char *mem1, unsigned char *mem2,
-        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
-        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
-        const char *obj2, int *ph)
+static hsize_t diff_llong_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, diff_opt_t *opts)
 {
     hsize_t   nfound = 0; /* number of differences found */
     long long temp1_llong;
     long long temp2_llong;
-    hsize_t   i;
     double    per;
-    hbool_t   both_zero;
+    hbool_t   both_zero = FALSE;
 
-    /* -d and !-p */
-    if (opts->d && !opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_llong, mem1, sizeof(long long));
-            HDmemcpy(&temp2_llong, mem2, sizeof(long long));
+    H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool);
 
-            if (ABS( temp1_llong-temp2_llong) > opts->delta) {
-                if (print_data(opts)) {
-                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(LLI_FORMAT, temp1_llong, temp2_llong, ABS(temp1_llong - temp2_llong));
-                }
-                nfound++;
+    HDmemcpy(&temp1_llong, mem1, sizeof(long long));
+    HDmemcpy(&temp2_llong, mem2, sizeof(long long));
+
+    /* -d and !-p */
+    if (opts->delta_bool && !opts->percent_bool) {
+        if (ABS( temp1_llong-temp2_llong) > opts->delta) {
+            opts->print_percentage = 0;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(LLI_FORMAT, temp1_llong, temp2_llong, ABS(temp1_llong - temp2_llong));
             }
-            mem1 += sizeof(long long);
-            mem2 += sizeof(long long);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
+            nfound++;
         }
     }
     /* !-d and -p */
-    else if (!opts->d && opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_llong, mem1, sizeof(long long));
-            HDmemcpy(&temp2_llong, mem2, sizeof(long long));
-
-            PER(temp1_llong, temp2_llong);
+    else if (!opts->delta_bool && opts->percent_bool) {
+        PER(temp1_llong, temp2_llong);
 
-            if (not_comparable && !both_zero) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
+        if (not_comparable && !both_zero) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
                 parallel_print(LLI_FORMAT_P_NOTCOMP, temp1_llong, temp2_llong, ABS(temp1_llong - temp2_llong));
             }
             nfound++;
         }
         else if (per > opts->percent) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
             if (print_data(opts)) {
-                print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                parallel_print(SPACES);
                 parallel_print(LLI_FORMAT_P, temp1_llong, temp2_llong, ABS(temp1_llong - temp2_llong),per);
             }
             nfound++;
         }
-        mem1 += sizeof(long long);
-        mem2 += sizeof(long long);
-        if (opts->n && nfound >= opts->count)
-            return nfound;
-        }
     }
     /* -d and -p */
-    else if (opts->d && opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_llong, mem1, sizeof(long long));
-            HDmemcpy(&temp2_llong, mem2, sizeof(long long));
-
-            PER(temp1_llong, temp2_llong);
+    else if (opts->delta_bool && opts->percent_bool) {
+        PER(temp1_llong, temp2_llong);
 
-            if (not_comparable && !both_zero) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(LLI_FORMAT_P_NOTCOMP, temp1_llong, temp2_llong, ABS(temp1_llong - temp2_llong));
-                }
-                nfound++;
+        if (not_comparable && !both_zero) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(LLI_FORMAT_P_NOTCOMP, temp1_llong, temp2_llong, ABS(temp1_llong - temp2_llong));
             }
-            else if (per > opts->percent
-                    && ABS(temp1_llong-temp2_llong) > opts->delta) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(LLI_FORMAT_P, temp1_llong, temp2_llong, ABS(temp1_llong - temp2_llong),per);
-                }
-                nfound++;
+            nfound++;
+        }
+        else if (per > opts->percent && ABS(temp1_llong-temp2_llong) > opts->delta) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(LLI_FORMAT_P, temp1_llong, temp2_llong, ABS(temp1_llong - temp2_llong),per);
             }
-            mem1 += sizeof(long long);
-            mem2 += sizeof(long long);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
+            nfound++;
         }
     }
     else {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_llong, mem1, sizeof(long long));
-            HDmemcpy(&temp2_llong, mem2, sizeof(long long));
-
-            if (temp1_llong != temp2_llong) {
-                if (print_data(opts)) {
-                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(LLI_FORMAT, temp1_llong, temp2_llong, ABS(temp1_llong - temp2_llong));
-                }
-                nfound++;
+        if (temp1_llong != temp2_llong) {
+            opts->print_percentage = 0;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(LLI_FORMAT, temp1_llong, temp2_llong, ABS(temp1_llong - temp2_llong));
             }
-
-            mem1 += sizeof(long long);
-            mem2 += sizeof(long long);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
-        } /* nelmts */
+            nfound++;
+        }
     }
 
+    H5TOOLS_ENDDEBUG(":%d - errstat:%d", nfound, opts->err_stat);
+
     return nfound;
 }
 
 /*-------------------------------------------------------------------------
- * Function: diff_ullong
+ * Function: diff_ullong_element
  *
- * Purpose:  diff a H5T_NATIVE_ULLONG type
+ * Purpose:  diff a single H5T_NATIVE_ULLONG type
  *
  * Return:   number of differences found
  *-------------------------------------------------------------------------
  */
-static hsize_t diff_ullong(unsigned char *mem1, unsigned char *mem2,
-        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims, hsize_t *acc,
-        hsize_t *pos, diff_opt_t *opts, const char *obj1, const char *obj2, int *ph)
-
+static hsize_t diff_ullong_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, diff_opt_t *opts)
 {
     hsize_t            nfound = 0; /* number of differences found */
     unsigned long long temp1_ullong;
     unsigned long long temp2_ullong;
-    hsize_t            i;
     float              f1, f2;
     double             per;
-    hbool_t            both_zero;
+    hbool_t            both_zero = FALSE;
 
-    /* -d and !-p */
-    if (opts->d && !opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_ullong, mem1, sizeof(unsigned long long));
-            HDmemcpy(&temp2_ullong, mem2, sizeof(unsigned long long));
+    H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool);
 
-            if (PDIFF(temp1_ullong,temp2_ullong) > (unsigned long long) opts->delta) {
-                if (print_data(opts)) {
-                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(ULLI_FORMAT,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong));
-                }
-                nfound++;
+    HDmemcpy(&temp1_ullong, mem1, sizeof(unsigned long long));
+    HDmemcpy(&temp2_ullong, mem2, sizeof(unsigned long long));
+
+    /* -d and !-p */
+    if (opts->delta_bool && !opts->percent_bool) {
+        if (PDIFF(temp1_ullong,temp2_ullong) > (unsigned long long) opts->delta) {
+            opts->print_percentage = 0;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(ULLI_FORMAT, temp1_ullong, temp2_ullong, PDIFF(temp1_ullong, temp2_ullong));
             }
-            mem1 += sizeof(unsigned long long);
-            mem2 += sizeof(unsigned long long);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
+            nfound++;
         }
     }
     /* !-d and -p */
-    else if (!opts->d && opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_ullong, mem1, sizeof(unsigned long long));
-            HDmemcpy(&temp2_ullong, mem2, sizeof(unsigned long long));
-
-            ull2float(temp1_ullong, &f1);
-            ull2float(temp2_ullong, &f2);
-            PER(f1, f2);
-
-            if (not_comparable && !both_zero) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(ULLI_FORMAT_P_NOTCOMP,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong));
-                }
-                nfound++;
+    else if (!opts->delta_bool && opts->percent_bool) {
+        ull2float(temp1_ullong, &f1);
+        ull2float(temp2_ullong, &f2);
+        PER(f1, f2);
+
+        if (not_comparable && !both_zero) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(ULLI_FORMAT_P_NOTCOMP, temp1_ullong, temp2_ullong, PDIFF(temp1_ullong, temp2_ullong));
             }
-            else if (per > opts->percent) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(ULLI_FORMAT_P,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong),per);
-                }
-                nfound++;
+            nfound++;
+        }
+        else if (per > opts->percent) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(ULLI_FORMAT_P, temp1_ullong, temp2_ullong, PDIFF(temp1_ullong,temp2_ullong), per);
             }
-            mem1 += sizeof(unsigned long long);
-            mem2 += sizeof(unsigned long long);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
+            nfound++;
         }
     }
     /* -d and -p */
-    else if (opts->d && opts->p) {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_ullong, mem1, sizeof(unsigned long long));
-            HDmemcpy(&temp2_ullong, mem2, sizeof(unsigned long long));
-
-            ull2float(temp1_ullong, &f1);
-            ull2float(temp2_ullong, &f2);
-            PER(f1, f2);
-
-            if (not_comparable && !both_zero) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(ULLI_FORMAT_P_NOTCOMP,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong));
-                }
-                nfound++;
+    else if (opts->delta_bool && opts->percent_bool) {
+        ull2float(temp1_ullong, &f1);
+        ull2float(temp2_ullong, &f2);
+        PER(f1, f2);
+
+        if (not_comparable && !both_zero) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(ULLI_FORMAT_P_NOTCOMP, temp1_ullong, temp2_ullong, PDIFF(temp1_ullong, temp2_ullong));
             }
-            else if (per > opts->percent
-                    && PDIFF(temp1_ullong,temp2_ullong) > (unsigned long long) opts->delta) {
-                if (print_data(opts)) {
-                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(ULLI_FORMAT_P,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong),per);
-                }
-                nfound++;
+            nfound++;
+        }
+        else if (per > opts->percent && PDIFF(temp1_ullong,temp2_ullong) > (unsigned long long) opts->delta) {
+            opts->print_percentage = 1;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(ULLI_FORMAT_P, temp1_ullong, temp2_ullong, PDIFF(temp1_ullong, temp2_ullong), per);
             }
-            mem1 += sizeof(unsigned long long);
-            mem2 += sizeof(unsigned long long);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
+            nfound++;
         }
     }
     else {
-        for (i = 0; i < nelmts; i++) {
-            HDmemcpy(&temp1_ullong, mem1, sizeof(unsigned long long));
-            HDmemcpy(&temp2_ullong, mem2, sizeof(unsigned long long));
-
-            if (temp1_ullong != temp2_ullong) {
-                if (print_data(opts)) {
-                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
-                    parallel_print(SPACES);
-                    parallel_print(ULLI_FORMAT,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong));
-                }
-                nfound++;
+        if (temp1_ullong != temp2_ullong) {
+            opts->print_percentage = 0;
+            print_pos(opts, elem_idx, -1);
+            if (print_data(opts)) {
+                parallel_print(ULLI_FORMAT, temp1_ullong, temp2_ullong, PDIFF(temp1_ullong, temp2_ullong));
             }
-
-            mem1 += sizeof(unsigned long long);
-            mem2 += sizeof(unsigned long long);
-            if (opts->n && nfound >= opts->count)
-                return nfound;
-        } /* nelmts */
+            nfound++;
+        }
     }
 
+    H5TOOLS_ENDDEBUG(": %d zero:%d", nfound, both_zero);
     return nfound;
 }
 
@@ -4391,7 +3008,7 @@ static hbool_t equal_float(float value, float expected, diff_opt_t *opts) {
 static
 int print_data(diff_opt_t *opts)
 {
-    return ((opts->m_report || opts->m_verbose) && !opts->m_quiet) ? 1 : 0;
+    return ((opts->mode_report || opts->mode_verbose) && !opts->mode_quiet) ? 1 : 0;
 }
 
 /*-------------------------------------------------------------------------
@@ -4401,25 +3018,24 @@ int print_data(diff_opt_t *opts)
  *-------------------------------------------------------------------------
  */
 static
-void print_header(int pp, /* print percentage */
-        int rank, hsize_t *dims, const char *obj1, const char *obj2)
+void print_header(diff_opt_t *opts)
 {
     /* print header */
     parallel_print("%-16s", "size:");
-    print_dimensions(rank, dims);
+    print_dimensions(opts->rank, opts->dims);
     parallel_print("%-11s", "");
-    print_dimensions(rank, dims);
+    print_dimensions(opts->rank, opts->dims);
     parallel_print("\n");
 
-    if (pp) {
+    if (opts->print_percentage) {
         parallel_print("%-15s %-15s %-15s %-15s %-15s\n", "position",
-                (obj1 != NULL) ? obj1 : " ", (obj2 != NULL) ? obj2 : " ", "difference", "relative");
+                opts->obj_name[0], opts->obj_name[1], "difference", "relative");
         parallel_print(
                 "------------------------------------------------------------------------\n");
     }
     else {
         parallel_print("%-15s %-15s %-15s %-20s\n", "position",
-                (obj1 != NULL) ? obj1 : " ", (obj2 != NULL) ? obj2 : " ", "difference");
+                opts->obj_name[0], opts->obj_name[1], "difference");
         parallel_print(
                 "------------------------------------------------------------\n");
     }
@@ -4432,77 +3048,93 @@ void print_header(int pp, /* print percentage */
  *-------------------------------------------------------------------------
  */
 static
-void print_pos(int *ph, /* print header */
-        int pp, /* print percentage */
-        hsize_t curr_pos, hsize_t *acc, hsize_t *pos, int rank, hsize_t *dims,
-        const char *obj1, const char *obj2)
+void print_pos(diff_opt_t *opts, hsize_t idx, ssize_t u)
 {
-    int i;
-
-    /* print header */
-    if (*ph == 1) {
-        *ph = 0;
-
-        print_header(pp, rank, dims, obj1, obj2);
-    } /* end print header */
-
-    for (i = 0; i < rank; i++) {
-        pos[i] = curr_pos / acc[i];
-        curr_pos -= acc[i] * pos[i];
-    }
-    HDassert(curr_pos == 0);
+    int i,j;
+
+    H5TOOLS_START_DEBUG(" -- idx:%ld", idx);
+
+    if (print_data(opts)) {
+        /* print header */
+        if (opts->print_header == 1) {
+            opts->print_header = 0;
+
+            print_header(opts);
+        } /* end print header */
+
+        H5TOOLS_DEBUG("rank=%d", opts->rank);
+        if(opts->rank > 0) {
+            hsize_t curr_pos = idx;
+
+            parallel_print("[ ");
+            H5TOOLS_DEBUG("do calc_acc_pos[%ld] nelmts:%d - errstat:%d", i, opts->hs_nelmts, opts->err_stat);
+
+            if (opts->sset[0] != NULL) {
+                /* Subsetting is used - calculate total position */
+                hsize_t elmnt_cnt = 1;
+                hsize_t dim_cnt = 0; /* previous dim size */
+                hsize_t str_cnt = 0; /* previous dim stride */
+                hsize_t curr_idx = idx; /* calculated running position */
+                hsize_t str_idx = 0;
+                hsize_t blk_idx = 0;
+                hsize_t cnt_idx = 0;
+                hsize_t hs_idx = 0;
+                j = opts->rank-1;
+                do {
+                    cnt_idx = opts->sset[0]->count.data[j]; /* Count value for current dim */
+                    H5TOOLS_DEBUG("... sset loop:%d with curr_pos:%ld (curr_idx:%ld) - count:%ld", j, curr_pos, curr_idx, cnt_idx);
+                    blk_idx = opts->sset[0]->block.data[j]; /* Block value for current dim */
+                    H5TOOLS_DEBUG("... sset loop:%d with curr_pos:%ld (curr_idx:%ld) - block:%ld", j, curr_pos, curr_idx, blk_idx);
+                    hs_idx = cnt_idx * blk_idx; /* hyperslab area value for current dim */
+                    H5TOOLS_DEBUG("... sset loop:%d with curr_pos:%ld (curr_idx:%ld) - hs:%ld", j, curr_pos, curr_idx, hs_idx);
+                    str_idx = opts->sset[0]->stride.data[j]; /* Stride value for current dim */
+                    H5TOOLS_DEBUG("... sset loop:%d with curr_pos:%ld (curr_idx:%ld) - stride:%ld", j, curr_pos, curr_idx, str_idx);
+                    elmnt_cnt *= opts->dims[j]; /* Total number of elements in dimension */
+                    H5TOOLS_DEBUG("... sset loop:%d with elmnt_cnt:%ld", j, elmnt_cnt);
+                    if (str_idx > blk_idx)
+                        curr_idx += dim_cnt * (str_idx - blk_idx); /* */
+                    else if (curr_idx >= hs_idx)
+                        curr_idx += dim_cnt * str_cnt;
+                    H5TOOLS_DEBUG("... sset loop:%d with idx:%ld (curr_idx:%ld) - stride:%ld", j, idx, curr_idx, str_idx);
+                    dim_cnt = elmnt_cnt; /* */
+                    if (str_idx > blk_idx)
+                        str_cnt = str_idx - blk_idx; /* */
+                    else
+                        str_cnt = str_idx; /* */
+                    H5TOOLS_DEBUG("... sset loop:%d with dim_cnt:%ld - str_cnt:%ld", j, dim_cnt, str_cnt);
+                    j--;
+                } while (curr_idx >= elmnt_cnt && j >= 0);
+                curr_pos = curr_idx; /* New current position */
+                H5TOOLS_DEBUG("pos loop:%d,%d with  elmnt_cnt:%ld - curr_pos:%ld", i, j, elmnt_cnt, curr_pos);
+            } /* if (opts->sset[0] != NULL) */
+            /*
+             * Calculate the number of elements represented by a unit change in a
+             * certain index position.
+             */
+            calc_acc_pos(opts->rank, curr_pos, opts->acc, opts->pos);
 
-    if (rank > 0) {
-        parallel_print("[ ");
-        for (i = 0; i < rank; i++) {
-            parallel_print(HSIZE_T_FORMAT, (unsigned long long)pos[i]);
-            parallel_print(" ");
+            for (i = 0; i < opts->rank; i++) {
+                H5TOOLS_DEBUG("pos loop:%d with opts->pos=%ld opts->sm_pos=%ld", i, opts->pos[i], opts->sm_pos[i]);
+                opts->pos[i] += (unsigned long) opts->sm_pos[i];
+                H5TOOLS_DEBUG("pos loop:%d with opts->pos=%ld", i, opts->pos[i]);
+                parallel_print(HSIZE_T_FORMAT, (unsigned long long)opts->pos[i]);
+                parallel_print(" ");
+            }
+            parallel_print("]");
         }
-        parallel_print("]");
-    }
-    else
-        parallel_print("      ");
-}
-
-/*-------------------------------------------------------------------------
- * Function: print_char_pos
- *
- * Purpose:  print character position in string
- *-------------------------------------------------------------------------
- */
-static
-void print_char_pos(int *ph, /* print header */
-        int pp, /* print percentage */
-        hsize_t curr_pos, size_t u, hsize_t *acc, hsize_t *pos, int rank, hsize_t *dims,
-        const char *obj1, const char *obj2)
-{
-    int i;
-
-    /* print header */
-    if (*ph == 1) {
-        *ph = 0;
-
-        print_header(pp, rank, dims, obj1, obj2);
-    } /* end print header */
-
-    for (i = 0; i < rank; i++) {
-        pos[i] = curr_pos / acc[i];
-        curr_pos -= acc[i] * pos[i];
-    }
-    HDassert(curr_pos == 0);
-
-    parallel_print("[ ");
-    if (rank > 0) {
-        for (i = 0; i < rank; i++) {
-            parallel_print(HSIZE_T_FORMAT, (unsigned long long)pos[i]);
-            parallel_print(" ");
+        else {
+            if (u >= 0) {
+                parallel_print("[ ");
+                parallel_print("%zu", u);
+                parallel_print("]");
+            }
+            else
+                parallel_print("      ");
         }
-
+        parallel_print(SPACES);
     }
-    else
-        parallel_print("%zu", u);
 
-    parallel_print("]");
+    H5TOOLS_ENDDEBUG("");
 }
 
 /*-------------------------------------------------------------------------
diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c
index 731fc54..3b5f6cc 100644
--- a/tools/lib/h5diff_attr.c
+++ b/tools/lib/h5diff_attr.c
@@ -137,7 +137,7 @@ static void table_attr_mark_exist(unsigned *exist, char *name, table_attrs_t *ta
  * Parameter:
  *  table_out [OUT] : return the list
  *------------------------------------------------------------------------*/
-static herr_t build_match_list_attrs(hid_t loc1_id, hid_t loc2_id, table_attrs_t ** table_out,  diff_opt_t *opts)
+static herr_t build_match_list_attrs(hid_t loc1_id, hid_t loc2_id, table_attrs_t ** table_out, diff_opt_t *opts)
 {
     table_attrs_t *table_lp = NULL;
     H5O_info_t     oinfo1, oinfo2;    /* Object info */
@@ -154,10 +154,14 @@ static herr_t build_match_list_attrs(hid_t loc1_id, hid_t loc2_id, table_attrs_t
 
     H5TOOLS_START_DEBUG(" - errstat:%d", opts->err_stat);
 
-    if(H5Oget_info2(loc1_id, &oinfo1, H5O_INFO_NUM_ATTRS) < 0)
+    if(H5Oget_info2(loc1_id, &oinfo1, H5O_INFO_NUM_ATTRS) < 0) {
         H5TOOLS_GOTO_ERROR(FAIL, "H5Oget_info first object failed");
-    if(H5Oget_info2(loc2_id, &oinfo2, H5O_INFO_NUM_ATTRS) < 0)
+    }
+    H5TOOLS_DEBUG("H5Oget_info3 loc1id=%d", oinfo1.num_attrs);
+    if(H5Oget_info2(loc2_id, &oinfo2, H5O_INFO_NUM_ATTRS) < 0) {
         H5TOOLS_GOTO_ERROR(FAIL, "H5Oget_info second object failed");
+    }
+    H5TOOLS_DEBUG("H5Oget_info3 loc2id=%d", oinfo2.num_attrs);
 
     table_attrs_init(&table_lp);
     if (table_lp == NULL)
@@ -167,8 +171,8 @@ static herr_t build_match_list_attrs(hid_t loc1_id, hid_t loc2_id, table_attrs_t
      * build the list
      */
     while(curr1 < oinfo1.num_attrs && curr2 < oinfo2.num_attrs) {
-        H5TOOLS_DEBUG("build_match_list_attrs 1: %ld - %ld", curr1, oinfo1.num_attrs);
-        H5TOOLS_DEBUG("build_match_list_attrs 2: %ld - %ld", curr2, oinfo2.num_attrs);
+        H5TOOLS_DEBUG("list_attrs 1: %ld - %ld", curr1, oinfo1.num_attrs);
+        H5TOOLS_DEBUG("list_attrs 2: %ld - %ld", curr2, oinfo2.num_attrs);
 
         /*------------------
         * open attribute1 */
@@ -222,7 +226,7 @@ static herr_t build_match_list_attrs(hid_t loc1_id, hid_t loc2_id, table_attrs_t
     infile[0] = 1;
     infile[1] = 0;
     while(curr1 < oinfo1.num_attrs) {
-        H5TOOLS_DEBUG("build_match_list_attrs 1: %ld - %ld", curr1, oinfo1.num_attrs);
+        H5TOOLS_DEBUG("list_attrs 1: %ld - %ld", curr1, oinfo1.num_attrs);
 
         /*------------------
         * open attribute1 */
@@ -231,7 +235,7 @@ static herr_t build_match_list_attrs(hid_t loc1_id, hid_t loc2_id, table_attrs_t
         /* get name */
         if(H5Aget_name(attr1_id, (size_t)ATTR_NAME_MAX, name1) < 0)
             H5TOOLS_GOTO_ERROR(FAIL, "H5Aget_name first attribute failed");
-        H5TOOLS_DEBUG("build_match_list_attrs #1 name - %s", name1);
+        H5TOOLS_DEBUG("list_attrs 1 name - %s", name1);
 
         table_attr_mark_exist(infile, name1, table_lp);
         table_lp->nattrs_only1++;
@@ -246,7 +250,7 @@ static herr_t build_match_list_attrs(hid_t loc1_id, hid_t loc2_id, table_attrs_t
     infile[0] = 0;
     infile[1] = 1;
     while(curr2 < oinfo2.num_attrs) {
-        H5TOOLS_DEBUG("build_match_list_attrs 2: %ld - %ld", curr2, oinfo2.num_attrs);
+        H5TOOLS_DEBUG("list_attrs 2: %ld - %ld", curr2, oinfo2.num_attrs);
         /*------------------
         * open attribute2 */
         if((attr2_id = H5Aopen_by_idx(loc2_id, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)curr2, H5P_DEFAULT, H5P_DEFAULT)) < 0)
@@ -254,7 +258,7 @@ static herr_t build_match_list_attrs(hid_t loc1_id, hid_t loc2_id, table_attrs_t
         /* get name */
         if(H5Aget_name(attr2_id, (size_t)ATTR_NAME_MAX, name2) < 0)
             H5TOOLS_GOTO_ERROR(FAIL, "H5Aget_name second attribute failed");
-        H5TOOLS_DEBUG("build_match_list_attrs #2 name - %s", name2);
+        H5TOOLS_DEBUG("list_attrs 2 name - %s", name2);
 
         table_attr_mark_exist(infile, name2, table_lp);
         table_lp->nattrs_only2++;
@@ -268,7 +272,7 @@ static herr_t build_match_list_attrs(hid_t loc1_id, hid_t loc2_id, table_attrs_t
     /*------------------------------------------------------
      * print the list
      */
-    if(opts->m_verbose_level == 2) {
+    if(opts->mode_verbose_level == 2) {
         /* if '-v2' is detected */
         parallel_print("   obj1   obj2\n");
         parallel_print(" --------------------------------------\n");
@@ -280,7 +284,7 @@ static herr_t build_match_list_attrs(hid_t loc1_id, hid_t loc2_id, table_attrs_t
         } /* end for */
     }
 
-    if(opts->m_verbose_level >= 1)
+    if(opts->mode_verbose_level >= 1)
         parallel_print("Attributes status:  %d common, %d only in obj1, %d only in obj2\n",
                 table_lp->nattrs - table_lp->nattrs_only1 - table_lp->nattrs_only2,
                 table_lp->nattrs_only1, table_lp->nattrs_only2);
@@ -309,7 +313,8 @@ done:
  *-------------------------------------------------------------------------
  */
 
-hsize_t diff_attr_data(hid_t attr1_id, hid_t attr2_id, const char *name1, const char *name2, const char *path1, const char *path2, diff_opt_t *opts)
+hsize_t diff_attr_data(hid_t attr1_id, hid_t attr2_id,
+        const char *name1, const char *name2, const char *path1, const char *path2, diff_opt_t *opts)
 {
     hid_t      space1_id = H5I_INVALID_HID;    /* space ID */
     hid_t      space2_id = H5I_INVALID_HID;    /* space ID */
@@ -323,19 +328,15 @@ hsize_t diff_attr_data(hid_t attr1_id, hid_t attr2_id, const char *name1, const
     void      *buf2 = NULL;       /* data buffer */
     hbool_t    buf1hasdata = FALSE;    /* buffer has data */
     hbool_t    buf2hasdata = FALSE;    /* buffer has data */
-    hsize_t    nelmts1;           /* number of elements in dataset */
     int        rank1;             /* rank of dataset */
     int        rank2;             /* rank of dataset */
     hsize_t    dims1[H5S_MAX_RANK];    /* dimensions of dataset */
     hsize_t    dims2[H5S_MAX_RANK];    /* dimensions of dataset */
-    char       np1[512];
-    char       np2[512];
     hsize_t    nfound = 0;
     int        j;
     diff_err_t ret_value = opts->err_stat;
 
     H5TOOLS_START_DEBUG(" - errstat:%d", opts->err_stat);
-
     /* get the datatypes  */
     if((ftype1_id = H5Aget_type(attr1_id)) < 0)
         H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "H5Aget_type first attribute failed");
@@ -367,11 +368,32 @@ hsize_t diff_attr_data(hid_t attr1_id, hid_t attr2_id, const char *name1, const
     * check for comparable TYPE and SPACE
     *----------------------------------------------------------------------
     */
-    H5TOOLS_DEBUG("diff_attr_data check for comparable TYPE and SPACE");
+    H5TOOLS_DEBUG("Check for comparable TYPE and SPACE");
+
+    H5TOOLS_DEBUG("attr_names: %s - %s", name1, name2);
+    if (name1) {
+        j = (int)HDstrlen(name1);
+        H5TOOLS_DEBUG("attr1_name: %s - %d", name1, j);
+        if (j > 0) {
+            opts->obj_name[0] = (char *)HDcalloc((size_t)j + 1, sizeof(char));
+            HDstrncpy(opts->obj_name[0], name1, (size_t)j);
+            opts->obj_name[0][j] = '\0';
+        }
+    }
+    if (name2) {
+        j = (int)HDstrlen(name2);
+        H5TOOLS_DEBUG("attr2_name: %s - %d", name2, j);
+        if (j > 0) {
+            opts->obj_name[1] = (char *)HDcalloc((size_t)j + 1, sizeof(char));
+            HDstrncpy(opts->obj_name[1], name2, (size_t)j);
+            opts->obj_name[1][j] = '\0';
+        }
+    }
+    H5TOOLS_DEBUG("attr_names: %s - %s", opts->obj_name[0], opts->obj_name[1]);
 
     /* pass dims1 and dims2 for maxdims as well since attribute's maxdims
     * are always same */
-    if(diff_can_type(ftype1_id, ftype2_id, rank1, rank2, dims1, dims2, dims1, dims2, name1, name2, opts, 0) == 1) {
+    if(diff_can_type(ftype1_id, ftype2_id, rank1, rank2, dims1, dims2, dims1, dims2, opts, 0) == 1) {
         /*-----------------------------------------------------------------
         * "upgrade" the smaller memory size
         *------------------------------------------------------------------
@@ -379,17 +401,26 @@ hsize_t diff_attr_data(hid_t attr1_id, hid_t attr2_id, const char *name1, const
         if(FAIL == match_up_memsize(ftype1_id, ftype2_id, &mtype1_id, &mtype2_id, &msize1, &msize2))
             H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "match_up_memsize failed");
 
-        H5TOOLS_DEBUG("diff_attr_data read");
+        H5TOOLS_DEBUG("initialize read");
         /*---------------------------------------------------------------------
-        * read
+        * initialize diff_opt_t structure for dimensions
         *----------------------------------------------------------------------
         */
-        nelmts1 = 1;
-        for(j = 0; j < rank1; j++)
-            nelmts1 *= dims1[j];
+        opts->nelmts = 1;
+        for(j = 0; j < rank1; j++) {
+            opts->dims[j] = dims1[j];
+            opts->nelmts *= dims1[j];
+        }
+        opts->rank = rank1;
+        init_acc_pos(opts->rank, opts->dims, opts->acc, opts->pos, opts->p_min_idx);
 
-        buf1 = (void *)HDcalloc((size_t)(nelmts1), msize1);
-        buf2 = (void *)HDcalloc((size_t)(nelmts1), msize2);
+        /*---------------------------------------------------------------------
+        * read
+        *----------------------------------------------------------------------
+        */
+        buf1 = (void *)HDcalloc((size_t)(opts->nelmts), msize1);
+        buf2 = (void *)HDcalloc((size_t)(opts->nelmts), msize2);
+        H5TOOLS_DEBUG("attr buffer size %ld * %ld", opts->nelmts, msize1);
         if(buf1 == NULL || buf2 == NULL) {
             parallel_print("cannot read into memory\n");
             H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "buffer allocation failed");
@@ -400,6 +431,7 @@ hsize_t diff_attr_data(hid_t attr1_id, hid_t attr2_id, const char *name1, const
         }
         else
             buf1hasdata = TRUE;
+        H5TOOLS_DEBUG("attr H5Aread 1");
 
         if(H5Aread(attr2_id, mtype2_id, buf2) < 0) {
             parallel_print("Failed reading attribute2 %s\n", name2);
@@ -407,49 +439,84 @@ hsize_t diff_attr_data(hid_t attr1_id, hid_t attr2_id, const char *name1, const
         }
         else
             buf2hasdata = TRUE;
+        H5TOOLS_DEBUG("attr H5Aread 2");
 
         /* format output string */
-        HDsnprintf(np1, sizeof(np1), "%s of <%s>", name1, path1);
-        HDsnprintf(np2, sizeof(np1), "%s of <%s>", name2, path2);
+        if (opts->obj_name[0] != NULL)
+             HDfree(opts->obj_name[0]);
+        opts->obj_name[0] = NULL;
+        if (opts->obj_name[1] != NULL)
+             HDfree(opts->obj_name[1]);
+        opts->obj_name[1] = NULL;
+
+        H5TOOLS_DEBUG("attr_names: %s - %s : %s - %s", name1, name2, path1, path2);
+        if (name1) {
+            j = (int)HDstrlen(name1) + (int)HDstrlen(path1) + 7;
+            H5TOOLS_DEBUG("attr1_name: %s - %d", name1, j);
+            if (j > 0) {
+                opts->obj_name[0] = (char *)HDcalloc((size_t)j + 1, sizeof(char));
+                HDsnprintf(opts->obj_name[0], j, "%s of <%s>", name1, path1);
+                opts->obj_name[0][j] = '\0';
+            }
+        }
+        if (name2) {
+            j = (int)HDstrlen(name2) + (int)HDstrlen(path2) + 7;
+            H5TOOLS_DEBUG("attr2_name: %s - %d", name2, j);
+            if (j > 0) {
+                opts->obj_name[1] = (char *)HDcalloc((size_t)j + 1, sizeof(char));
+                HDsnprintf(opts->obj_name[1], j, "%s of <%s>", name2, path2);
+                opts->obj_name[1][j] = '\0';
+            }
+        }
 
         /*---------------------------------------------------------------------
         * array compare
         *----------------------------------------------------------------------
         */
-        H5TOOLS_DEBUG("diff_attr_data array compare %s - %s", name1, name1);
+        H5TOOLS_DEBUG("array compare %s - %s", opts->obj_name[0], opts->obj_name[1]);
+
+        opts->hs_nelmts = opts->nelmts;
+        opts->m_tid = mtype1_id;
+
+        /* initialize the current stripmine position; this is necessary to print the array indices */
+        for (j = 0; j < opts->rank; j++)
+            opts->sm_pos[j] = (hsize_t)0;
 
         /* always print name */
         /* verbose (-v) and report (-r) mode */
-        if(opts->m_verbose || opts->m_report) {
-            do_print_attrname("attribute", np1, np2);
+        if(opts->mode_verbose || opts->mode_report) {
+            do_print_attrname("attribute", opts->obj_name[0], opts->obj_name[1]);
 
-            nfound = diff_array(buf1, buf2, nelmts1, (hsize_t) 0, rank1,
-                    dims1, opts, np1, np2, mtype1_id, attr1_id, attr2_id);
+            nfound = diff_array(buf1, buf2, opts, attr1_id, attr2_id);
             print_found(nfound);
         }
         /* quiet mode (-q), just count differences */
-        else if(opts->m_quiet) {
-            nfound = diff_array(buf1, buf2, nelmts1, (hsize_t) 0, rank1,
-                    dims1, opts, np1, np2, mtype1_id, attr1_id, attr2_id);
+        else if(opts->mode_quiet) {
+            nfound = diff_array(buf1, buf2, opts, attr1_id, attr2_id);
         }
         /* the rest (-c, none, ...) */
         else {
-            nfound = diff_array(buf1, buf2, nelmts1, (hsize_t) 0, rank1,
-                    dims1, opts, np1, np2, mtype1_id, attr1_id, attr2_id);
+            nfound = diff_array(buf1, buf2, opts, attr1_id, attr2_id);
 
             /* print info if compatible and difference found */
             if (nfound) {
-                do_print_attrname("attribute", np1, np2);
+                do_print_attrname("attribute", opts->obj_name[0], opts->obj_name[1]);
                 print_found(nfound);
             } /* end if */
         } /* end else */
     }
-    H5TOOLS_DEBUG("diff_attr_data check for comparable TYPE and SPACE complete nfound:%d - errstat:%d", nfound, opts->err_stat);
+    H5TOOLS_DEBUG("check for comparable TYPE and SPACE complete nfound:%d - errstat:%d", nfound, opts->err_stat);
 
     /*----------------------------------------------------------------------
     * close
     *----------------------------------------------------------------------
     */
+   if (opts->obj_name[0] != NULL)
+        HDfree(opts->obj_name[0]);
+   opts->obj_name[0] = NULL;
+   if (opts->obj_name[1] != NULL)
+        HDfree(opts->obj_name[1]);
+   opts->obj_name[1] = NULL;
 
     /* Free buf1 and buf2, check both VLEN-data VLEN-string to reclaim any
     * VLEN memory first */
@@ -527,28 +594,32 @@ hsize_t diff_attr(hid_t loc1_id, hid_t loc2_id, const char *path1, const char *p
     unsigned       u;                 /* Local index variable */
     hsize_t        nfound = 0;
     hsize_t        nfound_total = 0;
+    diff_opt_t attr_opts;
     diff_err_t     ret_value = opts->err_stat;
 
     H5TOOLS_START_DEBUG(" - errstat:%d", opts->err_stat);
+    attr_opts = *opts;
+    attr_opts.obj_name[0] = NULL;
+    attr_opts.obj_name[1] = NULL;
 
-    if(build_match_list_attrs(loc1_id, loc2_id, &match_list_attrs, opts) < 0) {
+    if(build_match_list_attrs(loc1_id, loc2_id, &match_list_attrs, &attr_opts) < 0) {
         H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "build_match_list_attrs failed");
     }
-    H5TOOLS_DEBUG("build_match_list_attrs - errstat:%d", opts->err_stat);
+    H5TOOLS_DEBUG("check match_list_attrs - opts->contents:%d - errstat:%d", attr_opts.contents, attr_opts.err_stat);
 
     /* if detect any unique extra attr */
     if(match_list_attrs->nattrs_only1 || match_list_attrs->nattrs_only2) {
-        H5TOOLS_DEBUG("diff_attr attributes only in one file");
+        H5TOOLS_DEBUG("attributes only in one file");
         /* exit will be 1 */
-        opts->contents = 0;
+        attr_opts.contents = 0;
     }
-    H5TOOLS_DEBUG("match_list_attrs info - errstat:%d", opts->err_stat);
+    H5TOOLS_DEBUG("match_list_attrs info - opts->contents:%d", attr_opts.contents);
 
     for(u = 0; u < (unsigned)match_list_attrs->nattrs; u++) {
-        H5TOOLS_DEBUG("match_list_attrs loop[%d] - errstat:%d", u, opts->err_stat);
+        H5TOOLS_DEBUG("match_list_attrs loop[%d] - errstat:%d", u, attr_opts.err_stat);
         if((match_list_attrs->attrs[u].exist[0]) && (match_list_attrs->attrs[u].exist[1])) {
             name1 = name2 = match_list_attrs->attrs[u].name;
-            H5TOOLS_DEBUG("diff_attr name - %s", name1);
+            H5TOOLS_DEBUG("name - %s", name1);
 
             /*--------------
             * attribute 1 */
@@ -560,8 +631,8 @@ hsize_t diff_attr(hid_t loc1_id, hid_t loc2_id, const char *path1, const char *p
             if((attr2_id = H5Aopen(loc2_id, name2, H5P_DEFAULT)) < 0)
                 H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "H5Aopen second attribute failed");
 
-            H5TOOLS_DEBUG("diff_attr got attributes");
-            nfound = diff_attr_data(attr1_id, attr2_id, name1, name2, path1, path2, opts);
+            H5TOOLS_DEBUG("got attributes");
+            nfound = diff_attr_data(attr1_id, attr2_id, name1, name2, path1, path2, &attr_opts);
             if(H5Aclose(attr1_id) < 0)
                 H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "H5Aget_type first attribute failed");
             if(H5Aclose(attr2_id) < 0)
@@ -572,7 +643,10 @@ hsize_t diff_attr(hid_t loc1_id, hid_t loc2_id, const char *path1, const char *p
     } /* u */
 
 done:
-    opts->err_stat = opts->err_stat | ret_value;
+    opts->print_header = attr_opts.print_header;
+    opts->contents = attr_opts.contents;
+    opts->not_cmp = attr_opts.not_cmp;
+    opts->err_stat = attr_opts.err_stat | ret_value;
 
     H5E_BEGIN_TRY {
         table_attrs_free(match_list_attrs);
diff --git a/tools/lib/h5diff_dset.c b/tools/lib/h5diff_dset.c
index 7a2342b..79884fa 100644
--- a/tools/lib/h5diff_dset.c
+++ b/tools/lib/h5diff_dset.c
@@ -27,7 +27,8 @@
  * Return: Number of differences found
  *-------------------------------------------------------------------------
  */
-hsize_t diff_dataset(hid_t file1_id, hid_t file2_id, const char *obj1_name, const char *obj2_name, diff_opt_t *opts)
+hsize_t
+diff_dataset(hid_t file1_id, hid_t file2_id, const char *obj1_name, const char *obj2_name, diff_opt_t *opts)
 {
     int        status = -1;
     hid_t      did1 = H5I_INVALID_HID;
@@ -35,9 +36,15 @@ hsize_t diff_dataset(hid_t file1_id, hid_t file2_id, const char *obj1_name, cons
     hid_t      dcpl1 = H5I_INVALID_HID;
     hid_t      dcpl2 = H5I_INVALID_HID;
     hsize_t    nfound = 0;
+    diff_opt_t diff_opts;
     diff_err_t ret_value = opts->err_stat;
 
     H5TOOLS_START_DEBUG(" - errstat:%d", opts->err_stat);
+    diff_opts = *opts;
+    diff_opts.obj_name[0] = NULL;
+    diff_opts.obj_name[1] = NULL;
+
+    H5TOOLS_DEBUG("obj_names: %s - %s", obj1_name, obj2_name);
     /*-------------------------------------------------------------------------
      * open the handles
      *-------------------------------------------------------------------------
@@ -64,20 +71,22 @@ hsize_t diff_dataset(hid_t file1_id, hid_t file2_id, const char *obj1_name, cons
      * 2) the internal filters might be turned off
      *-------------------------------------------------------------------------
      */
-    H5TOOLS_DEBUG("diff_dataset h5tools_canreadf then diff_datasetid");
-    if ((status = h5tools_canreadf((opts->m_verbose ? obj1_name : NULL), dcpl1) == 1) &&
-            (status = h5tools_canreadf((opts->m_verbose ? obj2_name : NULL), dcpl2) == 1))
-        nfound = diff_datasetid(did1, did2, obj1_name, obj2_name, opts);
+    H5TOOLS_DEBUG("h5tools_canreadf then diff_datasetid");
+    if ((status = h5tools_canreadf((opts->mode_verbose ? obj1_name : NULL), dcpl1) == 1) &&
+            (status = h5tools_canreadf((opts->mode_verbose ? obj2_name : NULL), dcpl2) == 1))
+        nfound = diff_datasetid(did1, did2, obj1_name, obj2_name, &diff_opts);
     else if (status < 0) {
         H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "h5tools_canreadf failed");
     }
     else {
         ret_value = 1;
-        opts->not_cmp = 1;
+        diff_opts.not_cmp = 1;
     }
 
 done:
-    opts->err_stat = opts->err_stat | ret_value;
+    opts->print_header = diff_opts.print_header;
+    opts->not_cmp = diff_opts.not_cmp;
+    opts->err_stat = diff_opts.err_stat | ret_value;
 
     /* disable error reporting */
     H5E_BEGIN_TRY {
@@ -143,36 +152,31 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-hsize_t diff_datasetid(hid_t did1, hid_t did2, const char *obj1_name, const char *obj2_name, diff_opt_t *opts)
+hsize_t
+diff_datasetid(hid_t did1, hid_t did2, const char *obj1_name, const char *obj2_name, diff_opt_t *opts)
 {
     hid_t      sid1 = H5I_INVALID_HID;
     hid_t      sid2 = H5I_INVALID_HID;
     hid_t      f_tid1 = H5I_INVALID_HID;
     hid_t      f_tid2 = H5I_INVALID_HID;
-    hid_t      dam_tid = H5I_INVALID_HID;             /* m_tid for diff_array function */
     hid_t      m_tid1 = H5I_INVALID_HID;
     hid_t      m_tid2 = H5I_INVALID_HID;
     hid_t      dcpl1 = H5I_INVALID_HID;
     hid_t      dcpl2 = H5I_INVALID_HID;
     H5D_layout_t     stl1 = -1;
     H5D_layout_t     stl2 = -1;
-    size_t     dam_size;                /* m_size for diff_array function */
     size_t     m_size1;
     size_t     m_size2;
     H5T_sign_t sign1;
     H5T_sign_t sign2;
     int        rank1;
     int        rank2;
-    hsize_t    danelmts;                /* nelmts for diff_array function */
     hsize_t    nelmts1;
     hsize_t    nelmts2;
-    hsize_t    *dadims;                 /* dims for diff_array function */
     hsize_t    dims1[H5S_MAX_RANK];
     hsize_t    dims2[H5S_MAX_RANK];
     hsize_t    maxdim1[H5S_MAX_RANK];
     hsize_t    maxdim2[H5S_MAX_RANK];
-    const char *name1 = NULL;           /* relative names */
-    const char *name2 = NULL;
     hsize_t    storage_size1;
     hsize_t    storage_size2;
     hsize_t    nfound = 0;              /* number of differences found */
@@ -181,9 +185,10 @@ hsize_t diff_datasetid(hid_t did1, hid_t did2, const char *obj1_name, const char
     void       *buf2 = NULL;
     void       *sm_buf1 = NULL;
     void       *sm_buf2 = NULL;
-    hid_t      sm_space = H5I_INVALID_HID;           /*stripmine data space */
+    hid_t      sm_space1 = H5I_INVALID_HID;           /*stripmine data space */
+    hid_t      sm_space2 = H5I_INVALID_HID;           /*stripmine data space */
     size_t     need;                    /* bytes needed for malloc */
-    int        i;
+    int        i, j;
     unsigned int  vl_data1 = 0;          /*contains VL datatypes */
     unsigned int  vl_data2 = 0;          /*contains VL datatypes */
     diff_err_t    ret_value = opts->err_stat;
@@ -233,13 +238,15 @@ hsize_t diff_datasetid(hid_t did1, hid_t did2, const char *obj1_name, const char
      */
     if((dcpl1 = H5Dget_create_plist(did1)) < 0)
         H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "H5Dget_create_plist failed");
-    if((dcpl2 = H5Dget_create_plist(did2)) < 0)
-        H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "H5Dget_create_plist failed");
-
     if((stl1 = H5Pget_layout(dcpl1)) < 0)
         H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "H5Pget_layout failed");
+    H5Pclose(dcpl1);
+
+    if((dcpl2 = H5Dget_create_plist(did2)) < 0)
+        H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "H5Dget_create_plist failed");
     if((stl2 = H5Pget_layout(dcpl2)) < 0)
         H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "H5Pget_layout failed");
+    H5Pclose(dcpl2);
 
     /*-------------------------------------------------------------------------
      * check for empty datasets
@@ -253,27 +260,48 @@ hsize_t diff_datasetid(hid_t did1, hid_t did2, const char *obj1_name, const char
 
     if(storage_size1 == 0 || storage_size2 == 0) {
         if(stl1 == H5D_VIRTUAL || stl2 == H5D_VIRTUAL) {
-            if((opts->m_verbose||opts->m_list_not_cmp) && obj1_name && obj2_name)
+            if((opts->mode_verbose||opts->mode_list_not_cmp) && obj1_name && obj2_name)
                 parallel_print("Warning: <%s> or <%s> is a virtual dataset\n", obj1_name, obj2_name);
         }
         else {
-            if((opts->m_verbose || opts->m_list_not_cmp) && obj1_name && obj2_name)
+            if((opts->mode_verbose || opts->mode_list_not_cmp) && obj1_name && obj2_name)
                 parallel_print("Not comparable: <%s> or <%s> is an empty dataset\n", obj1_name, obj2_name);
             can_compare = 0;
             opts->not_cmp = 1;
         }
     }
 
+    H5TOOLS_DEBUG("obj_names: %s - %s", obj1_name, obj2_name);
+    opts->obj_name[0] = NULL;
+    if (obj1_name) {
+        j = (int)HDstrlen(obj1_name);
+        H5TOOLS_DEBUG("obj1_name: %s - %d", obj1_name, j);
+        if (j > 0) {
+            opts->obj_name[0] = (char *)HDcalloc((size_t)j + 1, sizeof(char));
+            HDstrncpy(opts->obj_name[0], obj1_name, (size_t)j );
+            opts->obj_name[0][j] = '\0';
+        }
+    }
+
+
+    opts->obj_name[1] = NULL;
+    if (obj2_name) {
+        j = (int)HDstrlen(obj2_name);
+        H5TOOLS_DEBUG("obj2_name: %s - %d", obj2_name, j);
+        if (j > 0) {
+            opts->obj_name[1] = (char *)HDcalloc((size_t)j + 1, sizeof(char));
+            HDstrncpy(opts->obj_name[1], obj2_name, (size_t)j);
+            opts->obj_name[1][j] = '\0';
+        }
+    }
+
     /*-------------------------------------------------------------------------
      * check for comparable TYPE and SPACE
      *-------------------------------------------------------------------------
      */
-    if (diff_can_type(f_tid1, f_tid2, rank1, rank2,
-            dims1, dims2, maxdim1, maxdim2,
-            obj1_name, obj2_name,
-            opts, 0) != 1)
+    if (diff_can_type(f_tid1, f_tid2, rank1, rank2, dims1, dims2, maxdim1, maxdim2, opts, 0) != 1)
         can_compare = 0;
-    H5TOOLS_DEBUG("diff_can_type - errstat:%d", opts->err_stat);
+    H5TOOLS_DEBUG("diff_can_type returned errstat:%d", opts->err_stat);
 
     /*-------------------------------------------------------------------------
      * memory type and sizes
@@ -281,10 +309,10 @@ hsize_t diff_datasetid(hid_t did1, hid_t did2, const char *obj1_name, const char
      */
     H5TOOLS_DEBUG("check for memory type and sizes");
     if((m_tid1 = H5Tget_native_type(f_tid1, H5T_DIR_DEFAULT)) < 0)
-        H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "H5Tget_native_type failed");
+        H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "H5Tget_native_type first ftype failed");
 
     if((m_tid2 = H5Tget_native_type(f_tid2, H5T_DIR_DEFAULT)) < 0)
-        H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "H5Tget_native_type failed");
+        H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "H5Tget_native_type second ftype failed");
 
     m_size1 = H5Tget_size(m_tid1);
     m_size2 = H5Tget_size(m_tid2);
@@ -300,7 +328,7 @@ hsize_t diff_datasetid(hid_t did1, hid_t did2, const char *obj1_name, const char
         sign2 = H5Tget_sign(m_tid2);
         if(sign1 != sign2) {
             H5TOOLS_DEBUG("sign1 != sign2");
-            if((opts->m_verbose || opts->m_list_not_cmp) && obj1_name && obj2_name) {
+            if((opts->mode_verbose || opts->mode_list_not_cmp) && obj1_name && obj2_name) {
                 parallel_print("Not comparable: <%s> has sign %s ", obj1_name, get_sign(sign1));
                 parallel_print("and <%s> has sign %s\n", obj2_name, get_sign(sign2));
             }
@@ -348,41 +376,56 @@ hsize_t diff_datasetid(hid_t did1, hid_t did2, const char *obj1_name, const char
              *------------------------------------------------------------------
              */
             H5TOOLS_DEBUG("NOT H5T_ARRAY, upgrade the smaller memory size?");
-            if (FAIL == match_up_memsize (f_tid1, f_tid2,
-                                        &m_tid1, &m_tid2,
-                                        &m_size1, &m_size2))
+            if (FAIL == match_up_memsize (f_tid1, f_tid2, &m_tid1, &m_tid2, &m_size1, &m_size2))
                 H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "match_up_memsize failed");
             H5TOOLS_DEBUG("m_size: %ld - %ld", m_size1, m_size2);
-            dadims = dims1;
-            dam_size = m_size1;
-            dam_tid = m_tid1;
-            danelmts = nelmts1;
+            opts->rank = rank1;
+            for(i = 0; i < rank1; i++)
+                opts->dims[i] = dims1[i];
+            opts->m_size = m_size1;
+            opts->m_tid = m_tid1;
+            opts->nelmts = nelmts1;
             need = (size_t)(nelmts1 * m_size1);  /* bytes needed */
         }
         else {
             H5TOOLS_DEBUG("Array dims: %d - %d", dims1[0], dims2[0]);
             /* Compare the smallest array, but create the largest buffer */
             if(m_size1 <= m_size2) {
-                dadims = dims1;
-                dam_size = m_size1;
-                dam_tid = m_tid1;
-                danelmts = nelmts1;
+                opts->rank = rank1;
+                for(i = 0; i < rank1; i++)
+                    opts->dims[i] = dims1[i];
+                opts->m_size = m_size1;
+                opts->m_tid = m_tid1;
+                opts->nelmts = nelmts1;
                 need = (size_t)(nelmts2 * m_size2);  /* bytes needed */
             }
             else {
-                dadims = dims2;
-                dam_size = m_size2;
-                dam_tid = m_tid2;
-                danelmts = nelmts2;
+                opts->rank = rank2;
+                for(i = 0; i < rank2; i++)
+                    opts->dims[i] = dims2[i];
+                opts->m_size = m_size2;
+                opts->m_tid = m_tid2;
+                opts->nelmts = nelmts2;
                 need = (size_t)(nelmts1 * m_size1);  /* bytes needed */
             }
         }
+        opts->hs_nelmts = opts->nelmts;
+        H5TOOLS_DEBUG("need: %ld", need);
         /* print names */
+        H5TOOLS_DEBUG("obj_names: %s - %s", obj1_name, obj2_name);
+
+        if (opts->obj_name[0] != NULL)
+             HDfree(opts->obj_name[0]);
+        opts->obj_name[0] = NULL;
+        if (opts->obj_name[1] != NULL)
+             HDfree(opts->obj_name[1]);
+        opts->obj_name[1] = NULL;
+
         if(obj1_name)
-            name1 = diff_basename(obj1_name);
+            opts->obj_name[0] = HDstrdup(diff_basename(obj1_name));
         if(obj2_name)
-            name2 = diff_basename(obj2_name);
-        H5TOOLS_DEBUG("obj_names: %s - %s", name1, name2);
+            opts->obj_name[1] = HDstrdup(diff_basename(obj2_name));
+        H5TOOLS_DEBUG("obj_names: %s - %s", opts->obj_name[0], opts->obj_name[1]);
 
 
         H5TOOLS_DEBUG("read/compare");
@@ -395,7 +438,14 @@ hsize_t diff_datasetid(hid_t did1, hid_t did2, const char *obj1_name, const char
             buf2 = HDmalloc(need);
         } /* end if */
 
-        if(buf1 != NULL && buf2 != NULL) {
+        /* Assume entire data space to be printed */
+        init_acc_pos(opts->rank, opts->dims, opts->acc, opts->pos, opts->p_min_idx);
+
+        for(i = 0; i < opts->rank; i++) {
+            opts->p_max_idx[i] = opts->dims[i];
+        }
+
+        if(buf1 != NULL && buf2 != NULL && opts->sset[0] == NULL && opts->sset[1] == NULL) {
             H5TOOLS_DEBUG("buf1 != NULL && buf2 != NULL");
             H5TOOLS_DEBUG("H5Dread did1");
             if(H5Dread(did1, m_tid1, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf1) < 0)
@@ -404,10 +454,13 @@ hsize_t diff_datasetid(hid_t did1, hid_t did2, const char *obj1_name, const char
             if(H5Dread(did2, m_tid2, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf2) < 0)
                 H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "H5Dread failed");
 
+            /* initialize the current stripmine position; this is necessary to print the array indices */
+            for (j = 0; j < opts->rank; j++)
+                opts->sm_pos[j] = (hsize_t)0;
+
             /* array diff */
-            nfound = diff_array(buf1, buf2, danelmts, (hsize_t)0, rank1, dadims,
-                opts, name1, name2, dam_tid, did1, did2);
-            H5TOOLS_DEBUG("diff_array nfound:%d - errstat:%d", nfound, opts->err_stat);
+            nfound = diff_array(buf1, buf2, opts, did1, did2);
+            H5TOOLS_DEBUG("diff_array ret nfound:%d - errstat:%d", nfound, opts->err_stat);
 
             /* reclaim any VL memory, if necessary */
             H5TOOLS_DEBUG("check vl_data1:%d", vl_data1);
@@ -426,111 +479,369 @@ hsize_t diff_datasetid(hid_t did1, hid_t did2, const char *obj1_name, const char
             }
         } /* end if */
         else { /* possibly not enough memory, read/compare by hyperslabs */
-            size_t        p_type_nbytes = dam_size; /*size of memory type */
-            hsize_t       p_nelmts = danelmts;      /*total selected elmts */
-            hsize_t       elmtno;                  /*counter  */
-            int           carry;                   /*counter carry value */
+            hsize_t       elmtno;                   /* counter  */
+            int           carry;                    /* counter carry value */
 
             /* stripmine info */
-            hsize_t       sm_size[H5S_MAX_RANK];   /*stripmine size */
-            hsize_t       sm_nbytes;               /*bytes per stripmine */
-            hsize_t       sm_nelmts;               /*elements per stripmine*/
+            hsize_t       sm_size[H5S_MAX_RANK];    /* stripmine size */
+            hsize_t       sm_block[H5S_MAX_RANK];   /* stripmine block size  */
+            hsize_t       sm_nbytes;                /* bytes per stripmine */
+            hsize_t       sm_nelmts1;               /* elements per stripmine */
+            hsize_t       sm_nelmts2;               /* elements per stripmine */
+            hssize_t      ssm_nelmts;               /* elements temp */
 
             /* hyperslab info */
-            hsize_t       hs_offset[H5S_MAX_RANK]; /*starting offset */
-            hsize_t       hs_size[H5S_MAX_RANK];   /*size this pass */
-            hsize_t       hs_nelmts;               /*elements in request */
-            hsize_t       zero[8];                 /*vector of zeros */
+            hsize_t       hs_offset1[H5S_MAX_RANK]; /* starting offset */
+            hsize_t       hs_count1[H5S_MAX_RANK];  /* number of blocks */
+            hsize_t       hs_block1[H5S_MAX_RANK];  /* size of blocks */
+            hsize_t       hs_stride1[H5S_MAX_RANK]; /* stride */
+            hsize_t       hs_size1[H5S_MAX_RANK];   /* size this pass */
+            hsize_t       hs_offset2[H5S_MAX_RANK]; /* starting offset */
+            hsize_t       hs_count2[H5S_MAX_RANK];  /* number of blocks */
+            hsize_t       hs_block2[H5S_MAX_RANK];  /* size of blocks */
+            hsize_t       hs_stride2[H5S_MAX_RANK]; /* stride */
+            hsize_t       hs_size2[H5S_MAX_RANK];   /* size this pass */
+            hsize_t       hs_nelmts1 = 0;           /* elements in request */
+            hsize_t       hs_nelmts2 = 0;           /* elements in request */
+            hsize_t       zero[8];                  /* vector of zeros */
+            hsize_t       low[H5S_MAX_RANK];        /* low bound of hyperslab */
+            hsize_t       high[H5S_MAX_RANK];       /* higher bound of hyperslab */
+
+            H5TOOLS_DEBUG("reclaim any VL memory and free unused buffers");
+            if(buf1 != NULL) {
+                /* reclaim any VL memory, if necessary */
+                if(vl_data1)
+                    H5Dvlen_reclaim(m_tid1, sid1, H5P_DEFAULT, buf1);
+                HDfree(buf1);
+                buf1 = NULL;
+            }
+            if(buf2 != NULL) {
+                /* reclaim any VL memory, if necessary */
+                if(vl_data2)
+                    H5Dvlen_reclaim(m_tid2, sid2, H5P_DEFAULT, buf2);
+                HDfree(buf2);
+                buf2 = NULL;
+            }
+
+            /* the stripmine loop */
+            HDmemset(hs_offset1, 0, sizeof hs_offset1);
+            HDmemset(hs_stride1, 0, sizeof hs_stride1);
+            HDmemset(hs_count1, 0, sizeof hs_count1);
+            HDmemset(hs_block1, 0, sizeof hs_block1);
+            HDmemset(hs_size1, 0, sizeof hs_size1);
+            HDmemset(hs_offset2, 0, sizeof hs_offset2);
+            HDmemset(hs_stride2, 0, sizeof hs_stride2);
+            HDmemset(hs_count2, 0, sizeof hs_count2);
+            HDmemset(hs_block2, 0, sizeof hs_block2);
+            HDmemset(hs_size2, 0, sizeof hs_size2);
+            HDmemset(zero, 0, sizeof zero);
+
+            /* if subsetting was requested - initialize the subsetting variables */
+            H5TOOLS_DEBUG("compare by hyperslabs: opts->nelmts=%ld - opts->m_size=%ld", opts->nelmts, opts->m_size);
+            if (opts->sset[0] != NULL) {
+                H5TOOLS_DEBUG("opts->sset[0] != NULL");
+
+                /* Check for valid settings - default if not specified */
+                if(!opts->sset[0]->start.data || !opts->sset[0]->stride.data || !opts->sset[0]->count.data || !opts->sset[0]->block.data) {
+                    /* they didn't specify a ``stride'' or ``block''. default to 1 in all
+                     * dimensions */
+                    if(!opts->sset[0]->start.data) {
+                        /* default to (0, 0, ...) for the start coord */
+                        opts->sset[0]->start.data = (hsize_t *)HDcalloc((size_t)rank1, sizeof(hsize_t));
+                        opts->sset[0]->start.len = (unsigned)rank1;
+                    }
+
+                    if(!opts->sset[0]->stride.data) {
+                        opts->sset[0]->stride.data = (hsize_t *)HDcalloc((size_t)rank1, sizeof(hsize_t));
+                        opts->sset[0]->stride.len = (unsigned)rank1;
+                        for (i = 0; i < rank1; i++)
+                            opts->sset[0]->stride.data[i] = 1;
+                    }
+
+                    if(!opts->sset[0]->count.data) {
+                        opts->sset[0]->count.data = (hsize_t *)HDcalloc((size_t)rank1, sizeof(hsize_t));
+                        opts->sset[0]->count.len = (unsigned)rank1;
+                        for (i = 0; i < rank1; i++)
+                            opts->sset[0]->count.data[i] = 1;
+                    }
+
+                    if(!opts->sset[0]->block.data) {
+                        opts->sset[0]->block.data = (hsize_t *)HDcalloc((size_t)rank1, sizeof(hsize_t));
+                        opts->sset[0]->block.len = (unsigned)rank1;
+                        for (i = 0; i < rank1; i++)
+                            opts->sset[0]->block.data[i] = 1;
+                    }
+
+                    /*-------------------------------------------------------------------------
+                     * check for block overlap
+                     *-------------------------------------------------------------------------
+                     */
+                    for(i = 0; i < rank1; i++) {
+                        if(opts->sset[0]->count.data[i] > 1) {
+                            if(opts->sset[0]->stride.data[i] < opts->sset[0]->block.data[i]) {
+                                H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "wrong subset selection[0]; blocks overlap");
+                            } /* end if */
+                        } /* end if */
+                    } /* end for */
+                }
+
+                /* Reset the total number of elements to the subset from the command */
+                opts->nelmts = 1;
+                for (i = 0; i < rank1; i++) {
+                    hs_offset1[i] = opts->sset[0]->start.data[i];
+                    hs_stride1[i] = opts->sset[0]->stride.data[i];
+                    hs_count1[i] = opts->sset[0]->count.data[i];
+                    hs_block1[i] = opts->sset[0]->block.data[i];
+                    opts->nelmts *= hs_count1[i] * hs_block1[i];
+                    hs_size1[i] = 0;
+                    H5TOOLS_DEBUG("[%d]hs_offset1:%ld, hs_stride1:%ld, hs_count1:%ld, hs_block1:%ld", i, hs_offset1[i], hs_stride1[i], hs_count1[i], hs_block1[i]);
+                }
+            }
+            if (opts->sset[1] != NULL) {
+                H5TOOLS_DEBUG("opts->sset[1] != NULL");
+
+                /* Check for valid settings - default if not specified */
+                if(!opts->sset[1]->start.data || !opts->sset[1]->stride.data || !opts->sset[1]->count.data || !opts->sset[1]->block.data) {
+                    /* they didn't specify a ``stride'' or ``block''. default to 1 in all
+                     * dimensions */
+                    if(!opts->sset[1]->start.data) {
+                        /* default to (0, 0, ...) for the start coord */
+                        opts->sset[1]->start.data = (hsize_t *)HDcalloc((size_t)rank2, sizeof(hsize_t));
+                        opts->sset[1]->start.len = (unsigned)rank2;
+                    }
+
+                    if(!opts->sset[1]->stride.data) {
+                        opts->sset[1]->stride.data = (hsize_t *)HDcalloc((size_t)rank2, sizeof(hsize_t));
+                        opts->sset[1]->stride.len = (unsigned)rank2;
+                        for (i = 0; i < rank2; i++)
+                            opts->sset[1]->stride.data[i] = 1;
+                    }
+
+                    if(!opts->sset[1]->count.data) {
+                        opts->sset[1]->count.data = (hsize_t *)HDcalloc((size_t)rank2, sizeof(hsize_t));
+                        opts->sset[1]->count.len = (unsigned)rank2;
+                        for (i = 0; i < rank2; i++)
+                            opts->sset[1]->count.data[i] = 1;
+                    }
+
+                    if(!opts->sset[1]->block.data) {
+                        opts->sset[1]->block.data = (hsize_t *)HDcalloc((size_t)rank2, sizeof(hsize_t));
+                        opts->sset[1]->block.len = (unsigned)rank2;
+                        for (i = 0; i < rank2; i++)
+                            opts->sset[1]->block.data[i] = 1;
+                    }
+
+                    /*-------------------------------------------------------------------------
+                     * check for block overlap
+                     *-------------------------------------------------------------------------
+                     */
+                    for(i = 0; i < rank2; i++) {
+                        if(opts->sset[1]->count.data[i] > 1) {
+                            if(opts->sset[1]->stride.data[i] < opts->sset[1]->block.data[i]) {
+                                H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "wrong subset selection[1]; blocks overlap");
+                            } /* end if */
+                        } /* end if */
+                    } /* end for */
+                }
+
+                for (i = 0; i < rank2; i++) {
+                    hs_offset2[i] = opts->sset[1]->start.data[i];
+                    hs_stride2[i] = opts->sset[1]->stride.data[i];
+                    hs_count2[i] = opts->sset[1]->count.data[i];
+                    hs_block2[i] = opts->sset[1]->block.data[i];
+                    hs_size2[i] = 0;
+                    H5TOOLS_DEBUG("[%d]hs_offset2:%ld, hs_stride2:%ld, hs_count2:%ld, hs_block2:%ld", i, hs_offset2[i], hs_stride2[i], hs_count2[i], hs_block2[i]);
+                }
+            }
 
             /*
              * determine the strip mine size and allocate a buffer. The strip mine is
              * a hyperslab whose size is manageable.
              */
-            sm_nbytes = p_type_nbytes;
-
-            for(i = rank1; i > 0; --i) {
-                hsize_t size = H5TOOLS_BUFSIZE / sm_nbytes;
-
-                if(size == 0) /* datum size > H5TOOLS_BUFSIZE */
-                    size = 1;
-                sm_size[i - 1] = MIN(dadims[i - 1], size);
-                sm_nbytes *= sm_size[i - 1];
-                H5TOOLS_DEBUG("sm_nbytes: %ld", sm_nbytes);
-            } /* end for */
-
-            /* malloc return code should be verified.
-             * If fail, need to handle the error.
-             * This else branch should be recoded as a separate function.
-             * Note that there are many "goto error" within this branch
-             * that fails to address freeing other objects created here.
-             * E.g., sm_space.
-             */
-            if((sm_buf1 = HDmalloc((size_t)sm_nbytes)) == NULL)
-                H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "HDmalloc failed");
-            if((sm_buf2 = HDmalloc((size_t)sm_nbytes)) == NULL)
-                H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "HDmalloc failed");
+            sm_nbytes = opts->m_size;
+            if(opts->rank > 0) {
+                for (i = opts->rank; i > 0; --i) {
+                    hsize_t size = H5TOOLS_BUFSIZE / sm_nbytes;
+                    if (size == 0) /* datum size > H5TOOLS_BUFSIZE */
+                        size = 1;
+                    H5TOOLS_DEBUG("opts->dims[%d]: %ld - size: %ld", i - 1, opts->dims[i - 1], size);
+                    if (opts->sset[1] != NULL) {
+                        sm_size[i - 1] = MIN(hs_block1[i - 1] * hs_count1[i - 1], size);
+                        sm_block[i - 1] = MIN(hs_block1[i - 1], sm_size[i - 1]);
+                    }
+                    else {
+                        sm_size[i - 1] = MIN(opts->dims[i - 1], size);
+                        sm_block[i - 1] = sm_size[i - 1];
+                    }
+                    H5TOOLS_DEBUG("sm_size[%d]: %ld - sm_block:%ld", i - 1, sm_size[i - 1], sm_block[i - 1]);
+                    sm_nbytes *= sm_size[i - 1];
+                    H5TOOLS_DEBUG("sm_nbytes: %ld", sm_nbytes);
+                }
+            }
 
-            sm_nelmts = sm_nbytes / p_type_nbytes;
-            sm_space = H5Screate_simple(1, &sm_nelmts, NULL);
+            H5TOOLS_DEBUG("opts->nelmts: %ld", opts->nelmts);
+            for(elmtno = 0; elmtno < opts->nelmts; elmtno += opts->hs_nelmts) {
+                H5TOOLS_DEBUG("elmtno: %ld - hs_nelmts1: %ld", elmtno, hs_nelmts1);
 
-            /* the stripmine loop */
-            HDmemset(hs_offset, 0, sizeof hs_offset);
-            HDmemset(zero, 0, sizeof zero);
+                if(NULL == (sm_buf1 = (unsigned char *)HDmalloc((size_t) sm_nbytes)))
+                    H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "Could not allocate buffer for strip-mine");
+                if(NULL == (sm_buf2 = (unsigned char *)HDmalloc((size_t) sm_nbytes)))
+                    H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "Could not allocate buffer for strip-mine");
 
-            for(elmtno = 0; elmtno < p_nelmts; elmtno += hs_nelmts) {
                 /* calculate the hyperslab size */
-                if(rank1 > 0) {
-                    for(i = 0, hs_nelmts = 1; i < rank1; i++) {
-                        hs_size[i] = MIN(dadims[i] - hs_offset[i], sm_size[i]);
-                        hs_nelmts *= hs_size[i];
-                    } /* end for */
-                    if(H5Sselect_hyperslab(sid1, H5S_SELECT_SET, hs_offset, NULL, hs_size, NULL) < 0)
-                        H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "H5Sselect_hyperslab failed");
-                    if(H5Sselect_hyperslab(sid2, H5S_SELECT_SET, hs_offset, NULL, hs_size, NULL) < 0)
+                /* initialize subset */
+                if(opts->rank > 0) {
+                    if (opts->sset[0] != NULL) {
+                        H5TOOLS_DEBUG("sset1 has data");
+                        /* calculate the potential number of elements */
+                        for(i = 0; i < rank1; i++) {
+                            H5TOOLS_DEBUG("[%d]opts->dims: %ld - hs_offset1: %ld - sm_block: %ld", i, opts->dims[i], hs_offset1[i], sm_block[i]);
+                            hs_size1[i] = MIN(opts->dims[i] - hs_offset1[i], sm_block[i]);
+                            H5TOOLS_DEBUG("hs_size1[%d]: %ld", i, hs_size1[i]);
+                        }
+                        if(H5Sselect_hyperslab(sid1, H5S_SELECT_SET, hs_offset1, hs_stride1, hs_count1, hs_size1) < 0)
+                            H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "H5Sselect_hyperslab sid1 failed");
+                    }
+                    else {
+                        for(i = 0, hs_nelmts1 = 1; i < rank1; i++) {
+                            H5TOOLS_DEBUG("[%d]opts->dims: %ld - hs_offset1: %ld - sm_block: %ld", i, opts->dims[i], hs_offset1[i], sm_block[i]);
+                            hs_size1[i] = MIN(opts->dims[i] - hs_offset1[i], sm_block[i]);
+                            H5TOOLS_DEBUG("hs_size1[%d]: %ld", i, hs_size1[i]);
+                            hs_nelmts1 *= hs_size1[i];
+                            H5TOOLS_DEBUG("hs_nelmts1:%ld *= hs_size1[%d]: %ld", hs_nelmts1, i, hs_size1[i]);
+                        }
+                        if(H5Sselect_hyperslab(sid1, H5S_SELECT_SET, hs_offset1, NULL, hs_size1, NULL) < 0)
+                            H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "H5Sselect_hyperslab sid1 failed");
+                    }
+
+                    if((ssm_nelmts = H5Sget_select_npoints(sid1)) < 0)
+                        H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "H5Sget_select_npoints failed");
+                    sm_nelmts1 = (hsize_t)ssm_nelmts;
+                    H5TOOLS_DEBUG("sm_nelmts1: %ld", sm_nelmts1);
+                    hs_nelmts1 = sm_nelmts1;
+
+                    if((sm_space1 = H5Screate_simple(1, &sm_nelmts1, NULL)) < 0)
+                        H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "H5Screate_simple failed");
+
+                    if(H5Sselect_hyperslab(sm_space1, H5S_SELECT_SET, zero, NULL, &sm_nelmts1, NULL) < 0)
                         H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "H5Sselect_hyperslab failed");
-                    if(H5Sselect_hyperslab(sm_space, H5S_SELECT_SET, zero, NULL, &hs_nelmts, NULL) < 0)
+
+                    if (opts->sset[1] != NULL) {
+                        H5TOOLS_DEBUG("sset2 has data");
+                        for(i = 0; i < rank2; i++) {
+                            H5TOOLS_DEBUG("[%d]opts->dims: %ld - hs_offset2: %ld - sm_block: %ld", i, opts->dims[i], hs_offset2[i], sm_block[i]);
+                            hs_size2[i] = MIN(opts->dims[i] - hs_offset2[i], sm_block[i]);
+                            H5TOOLS_DEBUG("hs_size2[%d]: %ld", i, hs_size2[i]);
+                        }
+                        if(H5Sselect_hyperslab(sid2, H5S_SELECT_SET, hs_offset2, hs_stride2, hs_count2, hs_size2) < 0)
+                            H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "H5Sselect_hyperslab sid2 failed");
+                    }
+                    else {
+                        for(i = 0, hs_nelmts2 = 1; i < rank2; i++) {
+                            H5TOOLS_DEBUG("[%d]opts->dims: %ld - hs_offset2: %ld - sm_block: %ld", i, opts->dims[i], hs_offset2[i], sm_block[i]);
+                            hs_size2[i] = MIN(opts->dims[i] - hs_offset2[i], sm_block[i]);
+                            H5TOOLS_DEBUG("hs_size2[%d]: %ld", i, hs_size2[i]);
+                            hs_nelmts2 *= hs_size2[i];
+                            H5TOOLS_DEBUG("hs_nelmts2:%ld *= hs_size2[%d]: %ld", hs_nelmts2, i, hs_size2[i]);
+                        }
+                        if(H5Sselect_hyperslab(sid2, H5S_SELECT_SET, hs_offset2, NULL, hs_size2, NULL) < 0)
+                            H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "H5Sselect_hyperslab sid2 failed");
+                    }
+
+                    if((ssm_nelmts = H5Sget_select_npoints(sid2)) < 0)
+                        H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "H5Sget_select_npoints failed");
+                    sm_nelmts2 = (hsize_t)ssm_nelmts;
+                    H5TOOLS_DEBUG("sm_nelmts2: %ld", sm_nelmts2);
+                    hs_nelmts2 = sm_nelmts2;
+
+                    if((sm_space2 = H5Screate_simple(1, &sm_nelmts2, NULL)) < 0)
+                        H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "H5Screate_simple failed");
+
+                    if(H5Sselect_hyperslab(sm_space2, H5S_SELECT_SET, zero, NULL, &sm_nelmts2, NULL) < 0)
                         H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "H5Sselect_hyperslab failed");
-                } /* end if */
+                }
                 else
-                    hs_nelmts = 1;
+                    hs_nelmts1 = 1;
+                opts->hs_nelmts = hs_nelmts1;
+                H5TOOLS_DEBUG("hs_nelmts: %ld", opts->hs_nelmts);
 
-                if(H5Dread(did1, m_tid1, sm_space, sid1, H5P_DEFAULT, sm_buf1) < 0)
+                /* read the data */
+                if(H5Dread(did1, m_tid1, sm_space1, sid1, H5P_DEFAULT, sm_buf1) < 0)
                     H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "H5Dread failed");
-                if(H5Dread(did2, m_tid2, sm_space, sid2, H5P_DEFAULT, sm_buf2) < 0)
+                if(H5Dread(did2, m_tid2, sm_space2, sid2, H5P_DEFAULT, sm_buf2) < 0)
                     H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "H5Dread failed");
 
+                /* print array indices. get the lower bound of the hyperslab and calculate
+                   the element position at the start of hyperslab */
+                if(H5Sget_select_bounds(sid1, low, high) < 0)
+                    H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "H5Sget_select_bounds failed");
+                /* initialize the current stripmine position; this is necessary to print the array indices */
+                for (j = 0; j < opts->rank; j++)
+                    opts->sm_pos[j] = low[j];
+
+                /* Assume entire data space to be printed */
+                init_acc_pos(opts->rank, opts->dims, opts->acc, opts->pos, opts->p_min_idx);
+
                 /* get array differences. in the case of hyperslab read, increment the number of differences
                 found in each hyperslab and pass the position at the beginning for printing */
-                nfound += diff_array(sm_buf1, sm_buf2, hs_nelmts, elmtno, rank1,
-                        dadims, opts, name1, name2, dam_tid, did1, did2);
-
-                /* reclaim any VL memory, if necessary */
-                if(vl_data1)
-                    H5Dvlen_reclaim(m_tid1, sm_space, H5P_DEFAULT, sm_buf1);
-                if(vl_data2)
-                    H5Dvlen_reclaim(m_tid2, sm_space, H5P_DEFAULT, sm_buf2);
+                nfound += diff_array(sm_buf1, sm_buf2, opts, did1, did2);
+
+                if(sm_buf1 != NULL) {
+                    /* reclaim any VL memory, if necessary */
+                    if(vl_data1)
+                        H5Dvlen_reclaim(m_tid1, sm_space1, H5P_DEFAULT, sm_buf1);
+                    HDfree(sm_buf1);
+                    sm_buf1 = NULL;
+                }
+                if(sm_buf2 != NULL) {
+                    /* reclaim any VL memory, if necessary */
+                    if(vl_data2)
+                        H5Dvlen_reclaim(m_tid2, sm_space2, H5P_DEFAULT, sm_buf2);
+                    HDfree(sm_buf2);
+                    sm_buf2 = NULL;
+                }
+
+                H5Sclose(sm_space1);
+                H5Sclose(sm_space2);
 
                 /* calculate the next hyperslab offset */
-                for(i = rank1, carry = 1; i > 0 && carry; --i) {
-                    hs_offset[i - 1] += hs_size[i - 1];
-                    if(hs_offset[i - 1] == dadims[i - 1])
-                        hs_offset[i - 1] = 0;
+                for(i = opts->rank, carry = 1; i > 0 && carry; --i) {
+                    if (opts->sset[0] != NULL) {
+                        H5TOOLS_DEBUG("[%d]hs_size1:%ld - hs_block1:%ld - hs_stride1:%ld", i-1, hs_size1[i-1], hs_block1[i - 1], hs_stride1[i - 1]);
+                        if(hs_size1[i - 1] >= hs_block1[i - 1]) {
+                            hs_offset1[i - 1] += hs_size1[i - 1];
+                        }
+                        else {
+                            hs_offset1[i - 1] += hs_stride1[i - 1];
+                        }
+                    }
+                    else
+                        hs_offset1[i - 1] += hs_size1[i - 1];
+                    H5TOOLS_DEBUG("[%d]hs_offset1:%ld - opts->dims:%ld", i-1, hs_offset1[i-1], opts->dims[i - 1]);
+                    if(hs_offset1[i - 1] >= opts->dims[i - 1])
+                        hs_offset1[i - 1] = 0;
                     else
                         carry = 0;
-                } /* i */
-            } /* elmtno */
-            if(sm_buf1 != NULL) {
-                HDfree(sm_buf1);
-                sm_buf1 = NULL;
-            }
-            if(sm_buf2 != NULL) {
-                HDfree(sm_buf2);
-                sm_buf2 = NULL;
-            }
-
-            H5Sclose(sm_space);
+                    H5TOOLS_DEBUG("[%d]hs_offset1:%ld", i-1, hs_offset1[i-1]);
+                    if (opts->sset[1] != NULL) {
+                        H5TOOLS_DEBUG("[%d]hs_size2:%ld - hs_block2:%ld - hs_stride2:%ld", i-1, hs_size2[i-1], hs_block2[i - 1], hs_stride2[i - 1]);
+                        if(hs_size2[i - 1] >= hs_block2[i - 1]) {
+                            hs_offset2[i - 1] += hs_size2[i - 1];
+                        }
+                        else {
+                            hs_offset2[i - 1] += hs_stride2[i - 1];
+                        }
+                    }
+                    else
+                        hs_offset2[i - 1] += hs_size2[i - 1];
+                    H5TOOLS_DEBUG("[%d]hs_offset2:%ld - opts->dims:%ld", i-1, hs_offset2[i-1], opts->dims[i - 1]);
+                    if(hs_offset2[i - 1] >= opts->dims[i - 1])
+                        hs_offset2[i - 1] = 0;
+                    H5TOOLS_DEBUG("[%d]hs_offset2:%ld", i-1, hs_offset2[i-1]);
+                }
+            } /* elmtno for loop */
         } /* hyperslab read */
-        H5TOOLS_DEBUG("can_compare complete");
+        H5TOOLS_DEBUG("can compare complete");
     } /*can_compare*/
 
 
@@ -538,12 +849,20 @@ hsize_t diff_datasetid(hid_t did1, hid_t did2, const char *obj1_name, const char
      * close
      *-------------------------------------------------------------------------
      */
-    H5TOOLS_DEBUG("reclaim any VL memory - errstat:%d", opts->err_stat);
 
 done:
     opts->err_stat = opts->err_stat | ret_value;
 
+    H5TOOLS_DEBUG("free names - errstat:%d", opts->err_stat);
     /* free */
+    if (opts->obj_name[0] != NULL)
+         HDfree(opts->obj_name[0]);
+    opts->obj_name[0] = NULL;
+    if (opts->obj_name[1] != NULL)
+         HDfree(opts->obj_name[1]);
+    opts->obj_name[1] = NULL;
+
+    H5TOOLS_DEBUG("reclaim any VL memory");
     if(buf1 != NULL) {
         /* reclaim any VL memory, if necessary */
         if(vl_data1)
@@ -558,26 +877,31 @@ done:
         HDfree(buf2);
         buf2 = NULL;
     }
+    H5TOOLS_DEBUG("reclaim any stripmine VL memory");
     if(sm_buf1 != NULL) {
         /* reclaim any VL memory, if necessary */
         if(vl_data1)
-            H5Dvlen_reclaim(m_tid1, sm_space, H5P_DEFAULT, sm_buf1);
+            H5Dvlen_reclaim(m_tid1, sm_space1, H5P_DEFAULT, sm_buf1);
         HDfree(sm_buf1);
         sm_buf1 = NULL;
     }
     if(sm_buf2 != NULL) {
         /* reclaim any VL memory, if necessary */
         if(vl_data2)
-            H5Dvlen_reclaim(m_tid2, sm_space, H5P_DEFAULT, sm_buf2);
+            H5Dvlen_reclaim(m_tid2, sm_space2, H5P_DEFAULT, sm_buf2);
         HDfree(sm_buf2);
         sm_buf2 = NULL;
     }
 
+    H5TOOLS_DEBUG("close ids");
     /* disable error reporting */
     H5E_BEGIN_TRY {
         H5Sclose(sid1);
         H5Sclose(sid2);
-        H5Sclose(sm_space);
+        H5Sclose(sm_space1);
+        H5Sclose(sm_space2);
+        H5Pclose(dcpl1);
+        H5Pclose(dcpl2);
         H5Tclose(f_tid1);
         H5Tclose(f_tid2);
         H5Tclose(m_tid1);
@@ -601,10 +925,9 @@ done:
  *-------------------------------------------------------------------------
  */
 
-int diff_can_type(hid_t f_tid1, hid_t f_tid2, int rank1, int rank2,
-                  hsize_t *dims1, hsize_t *dims2, hsize_t *maxdim1, hsize_t *maxdim2,
-                  const char *obj1_name, const char *obj2_name,
-                  diff_opt_t *opts, int is_compound)
+int
+diff_can_type(hid_t f_tid1, hid_t f_tid2, int rank1, int rank2, hsize_t *dims1, hsize_t *dims2,
+                  hsize_t *maxdim1, hsize_t *maxdim2, diff_opt_t *opts, int is_compound)
 {
     H5T_class_t  tclass1;
     H5T_class_t  tclass2;
@@ -623,19 +946,21 @@ int diff_can_type(hid_t f_tid1, hid_t f_tid2, int rank1, int rank2,
     if((tclass2 = H5Tget_class(f_tid2)) < 0)
         H5TOOLS_GOTO_ERROR(FAIL, "H5Tget_class second object failed");
 
+    H5TOOLS_DEBUG("obj_names: %s - %s", opts->obj_name[0], opts->obj_name[1]);
     if(tclass1 != tclass2) {
-        if((opts->m_verbose || opts->m_list_not_cmp) && obj1_name && obj2_name) {
+        if((opts->mode_verbose || opts->mode_list_not_cmp) && opts->obj_name[0] && opts->obj_name[1]) {
             if(is_compound) {
                 parallel_print("Not comparable: <%s> has a class %s and <%s> has a class %s\n",
-                        obj1_name, get_class(tclass1),
-                        obj2_name, get_class(tclass2));
+                        opts->obj_name[0], get_class(tclass1),
+                        opts->obj_name[1], get_class(tclass2));
             }
             else {
                 parallel_print("Not comparable: <%s> is of class %s and <%s> is of class %s\n",
-                        obj1_name, get_class(tclass1),
-                        obj2_name, get_class(tclass2));
+                        opts->obj_name[0], get_class(tclass1),
+                        opts->obj_name[1], get_class(tclass2));
             }
         }
+
         opts->not_cmp = 1;
         H5TOOLS_GOTO_DONE(0);
     }
@@ -646,10 +971,11 @@ int diff_can_type(hid_t f_tid1, hid_t f_tid2, int rank1, int rank2,
      */
     switch (tclass1) {
         case H5T_TIME:
-            if((opts->m_verbose || opts->m_list_not_cmp) && obj1_name && obj2_name) {
+            if((opts->mode_verbose || opts->mode_list_not_cmp) && opts->obj_name[0] && opts->obj_name[1]) {
                 parallel_print("Not comparable: <%s> and <%s> are of class %s\n",
-                        obj1_name, obj2_name, get_class(tclass2));
+                        opts->obj_name[0], opts->obj_name[1], get_class(tclass2));
             } /* end if */
+
             opts->not_cmp = 1;
             H5TOOLS_GOTO_DONE(0);
             break;
@@ -667,7 +993,7 @@ int diff_can_type(hid_t f_tid1, hid_t f_tid2, int rank1, int rank2,
         case H5T_NO_CLASS:
         case H5T_NCLASSES:
         default:
-            H5TOOLS_DEBUG("diff_can_type class - %s", get_class(tclass1));
+            H5TOOLS_DEBUG("class - %s", get_class(tclass1));
             break;
     } /* end switch */
 
@@ -675,15 +1001,15 @@ int diff_can_type(hid_t f_tid1, hid_t f_tid2, int rank1, int rank2,
      * check for equal file datatype; warning only
      *-------------------------------------------------------------------------
      */
-    if((H5Tequal(f_tid1, f_tid2) == 0) && (opts->m_verbose) && obj1_name && obj2_name) {
+    if((H5Tequal(f_tid1, f_tid2) == 0) && (opts->mode_verbose) && opts->obj_name[0] && opts->obj_name[1]) {
         H5T_class_t cl = H5Tget_class(f_tid1);
 
         parallel_print("Warning: different storage datatype\n");
         if(cl == H5T_INTEGER || cl == H5T_FLOAT) {
-            parallel_print("<%s> has file datatype ", obj1_name);
+            parallel_print("<%s> has file datatype ", opts->obj_name[0]);
             print_type(f_tid1);
             parallel_print("\n");
-            parallel_print("<%s> has file datatype ", obj2_name);
+            parallel_print("<%s> has file datatype ", opts->obj_name[1]);
             print_type(f_tid2);
             parallel_print("\n");
         }
@@ -694,18 +1020,19 @@ int diff_can_type(hid_t f_tid1, hid_t f_tid2, int rank1, int rank2,
      *-------------------------------------------------------------------------
      */
     if(rank1 != rank2) {
-        if((opts->m_verbose || opts->m_list_not_cmp) && obj1_name && obj2_name) {
-            parallel_print("Not comparable: <%s> has rank %d, dimensions ", obj1_name, rank1);
+        if((opts->mode_verbose || opts->mode_list_not_cmp) && opts->obj_name[0] && opts->obj_name[1]) {
+            parallel_print("Not comparable: <%s> has rank %d, dimensions ", opts->obj_name[0], rank1);
             print_dimensions(rank1, dims1);
             parallel_print(", max dimensions ");
             print_dimensions(rank1, maxdim1);
             parallel_print("\n" );
-            parallel_print("and <%s> has rank %d, dimensions ", obj2_name, rank2);
+            parallel_print("and <%s> has rank %d, dimensions ", opts->obj_name[1], rank2);
             print_dimensions(rank2, dims2);
             parallel_print(", max dimensions ");
             print_dimensions(rank2, maxdim2);
             parallel_print("\n");
         }
+
         opts->not_cmp = 1;
         H5TOOLS_GOTO_DONE(0);
     }
@@ -728,20 +1055,21 @@ int diff_can_type(hid_t f_tid1, hid_t f_tid2, int rank1, int rank2,
      *-------------------------------------------------------------------------
      */
     if(dim_diff == 1) {
-        if((opts->m_verbose || opts->m_list_not_cmp) && obj1_name && obj2_name) {
-            parallel_print("Not comparable: <%s> has rank %d, dimensions ", obj1_name, rank1);
+        if((opts->mode_verbose || opts->mode_list_not_cmp) && opts->obj_name[0] && opts->obj_name[1]) {
+            parallel_print("Not comparable: <%s> has rank %d, dimensions ", opts->obj_name[0], rank1);
             print_dimensions(rank1, dims1);
             if(maxdim1 && maxdim2) {
                 parallel_print(", max dimensions ");
                 print_dimensions(rank1, maxdim1);
                 parallel_print("\n" );
-                parallel_print("and <%s> has rank %d, dimensions ", obj2_name, rank2);
+                parallel_print("and <%s> has rank %d, dimensions ", opts->obj_name[1], rank2);
                 print_dimensions(rank2, dims2);
                 parallel_print(", max dimensions ");
                 print_dimensions(rank2, maxdim2);
                 parallel_print("\n");
             }
         }
+
         opts->not_cmp = 1;
         H5TOOLS_GOTO_DONE(0);
     }
@@ -750,13 +1078,13 @@ int diff_can_type(hid_t f_tid1, hid_t f_tid2, int rank1, int rank2,
      * maximum dimensions; just give a warning
      *-------------------------------------------------------------------------
      */
-    if(maxdim1 && maxdim2 && maxdim_diff == 1 && obj1_name) {
-        if(opts->m_verbose) {
+    if(maxdim1 && maxdim2 && maxdim_diff == 1 && opts->obj_name[0]) {
+        if(opts->mode_verbose) {
             parallel_print( "Warning: different maximum dimensions\n");
-            parallel_print("<%s> has max dimensions ", obj1_name);
+            parallel_print("<%s> has max dimensions ", opts->obj_name[0]);
             print_dimensions(rank1, maxdim1);
             parallel_print("\n");
-            parallel_print("<%s> has max dimensions ", obj2_name);
+            parallel_print("<%s> has max dimensions ", opts->obj_name[1]);
             print_dimensions(rank2, maxdim2);
             parallel_print("\n");
         }
@@ -765,16 +1093,17 @@ int diff_can_type(hid_t f_tid1, hid_t f_tid2, int rank1, int rank2,
     if(tclass1 == H5T_STRING) {
         htri_t vstrtype1 = -1;
         htri_t vstrtype2 = -1;
-        H5TOOLS_DEBUG("diff_can_type end - H5T_STRING");
+        H5TOOLS_DEBUG(" - H5T_STRING");
 
         vstrtype1 = H5Tis_variable_str(f_tid1);
         vstrtype2 = H5Tis_variable_str(f_tid2);
 
         /* no compare if either one but not both are variable string type */
         if (vstrtype1 != vstrtype2) {
-            if((opts->m_verbose || opts->m_list_not_cmp) && obj1_name && obj2_name)
+            if((opts->mode_verbose || opts->mode_list_not_cmp) && opts->obj_name[0] && opts->obj_name[1])
                 parallel_print("Not comparable: <%s> or <%s> is of mixed string type\n",
-                        obj1_name, obj2_name);
+                        opts->obj_name[0], opts->obj_name[1]);
+
             opts->not_cmp = 1;
             H5TOOLS_GOTO_DONE(0);
         }
@@ -786,17 +1115,18 @@ int diff_can_type(hid_t f_tid1, hid_t f_tid2, int rank1, int rank2,
         int   j;
         hid_t memb_type1 = H5I_INVALID_HID;
         hid_t memb_type2 = H5I_INVALID_HID;
-        H5TOOLS_DEBUG("diff_can_type end - H5T_COMPOUND");
+        H5TOOLS_DEBUG(" - H5T_COMPOUND");
 
         nmembs1 = H5Tget_nmembers(f_tid1);
         nmembs2 = H5Tget_nmembers(f_tid2);
 
         if(nmembs1 != nmembs2) {
-            if((opts->m_verbose || opts->m_list_not_cmp) && obj1_name && obj2_name) {
-                parallel_print("Not comparable: <%s> has %d members ", obj1_name, nmembs1);
-                parallel_print("<%s> has %d members ", obj2_name, nmembs2);
+            if((opts->mode_verbose || opts->mode_list_not_cmp) && opts->obj_name[0] && opts->obj_name[1]) {
+                parallel_print("Not comparable: <%s> has %d members ", opts->obj_name[0], nmembs1);
+                parallel_print("<%s> has %d members ", opts->obj_name[1], nmembs2);
                 parallel_print("\n");
             }
+
             opts->not_cmp = 1;
             H5TOOLS_GOTO_DONE(0);
         }
@@ -805,9 +1135,7 @@ int diff_can_type(hid_t f_tid1, hid_t f_tid2, int rank1, int rank2,
             memb_type1 = H5Tget_member_type(f_tid1, (unsigned)j);
             memb_type2 = H5Tget_member_type(f_tid2, (unsigned)j);
 
-            if (diff_can_type(memb_type1, memb_type2, rank1, rank2,
-                    dims1, dims2, maxdim1, maxdim2, obj1_name, obj2_name,
-                    opts, 1) != 1) {
+            if (diff_can_type(memb_type1, memb_type2, rank1, rank2, dims1, dims2, maxdim1, maxdim2, opts, 1) != 1) {
                 opts->not_cmp = 1;
                 H5Tclose(memb_type1);
                 H5Tclose(memb_type2);
@@ -826,19 +1154,17 @@ done:
 }
 
 
+#if defined (H5DIFF_DEBUG_UNUSED)
+/* this function is not currently used, but could be useful */
 /*-------------------------------------------------------------------------
  * Function: print_sizes
  *
  * Purpose: Print datatype sizes
  *-------------------------------------------------------------------------
  */
-#if defined (H5DIFF_DEBUG)
-void print_sizes( const char *obj1,
-                  const char *obj2,
-                  hid_t f_tid1,
-                  hid_t f_tid2,
-                  hid_t m_tid1,
-                  hid_t m_tid2 )
+void print_sizes( const char *obj1, const char *obj2, hid_t f_tid1, hid_t f_tid2, hid_t m_tid1, hid_t m_tid2);
+
+void print_sizes( const char *obj1, const char *obj2, hid_t f_tid1, hid_t f_tid2, hid_t m_tid1, hid_t m_tid2)
 {
     size_t  f_size1, f_size2;       /* size of type in file */
     size_t  m_size1, m_size2;       /* size of type in memory */
diff --git a/tools/lib/h5diff_util.c b/tools/lib/h5diff_util.c
index fd8eb99..59b11d6 100644
--- a/tools/lib/h5diff_util.c
+++ b/tools/lib/h5diff_util.c
@@ -211,7 +211,7 @@ diff_basename(const char *name)
  * Purpose:  Returns the type as a string
  *-------------------------------------------------------------------------
  */
-H5_ATTR_PURE H5_ATTR_CONST const char*
+H5_ATTR_CONST const char*
 get_type(h5trav_type_t type)
 {
     switch(type) {
@@ -242,7 +242,7 @@ get_type(h5trav_type_t type)
  * Purpose:  Returns the sign as a string
  *-------------------------------------------------------------------------
  */
-H5_ATTR_PURE const char*
+H5_ATTR_CONST const char*
 get_sign(H5T_sign_t sign)
 {
     switch(sign) {
@@ -270,7 +270,7 @@ get_sign(H5T_sign_t sign)
  * Purpose:  Returns the class as a string
  *-------------------------------------------------------------------------
  */
-H5_ATTR_PURE const char*
+H5_ATTR_CONST const char*
 get_class(H5T_class_t tclass)
 {
     switch(tclass) {
diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c
index 877f081..bbd30ac 100644
--- a/tools/lib/h5tools.c
+++ b/tools/lib/h5tools.c
@@ -29,59 +29,67 @@ int       H5tools_INDENT_g = 0;
 
 
 /* global variables */
-hid_t       H5tools_ERR_STACK_g = 0;
+H5E_auto2_t lib_func;
+H5E_auto2_t tools_func;
+void       *lib_edata;
+void       *tools_edata;
+
+hid_t       H5tools_ERR_STACK_g = H5I_INVALID_HID;
 hid_t       H5tools_ERR_CLS_g = H5I_INVALID_HID;
 hid_t       H5E_tools_g = H5I_INVALID_HID;
 hid_t       H5E_tools_min_id_g = H5I_INVALID_HID;
 hid_t       H5E_tools_min_info_id_g = H5I_INVALID_HID;
 hid_t       H5E_tools_min_dbg_id_g = H5I_INVALID_HID;
-int         compound_data;
+
 FILE       *rawattrstream = NULL;      /* should initialize to stdout but gcc moans about it */
 FILE       *rawdatastream = NULL;      /* should initialize to stdout but gcc moans about it */
 FILE       *rawinstream = NULL;        /* should initialize to stdin but gcc moans about it */
 FILE       *rawoutstream = NULL;       /* should initialize to stdout but gcc moans about it */
 FILE       *rawerrorstream = NULL;     /* should initialize to stderr but gcc moans about it */
+
 int         bin_output;         /* binary output */
 int         bin_form = 0;       /* binary form, default NATIVE */
 int         region_output;      /* region output */
 int         oid_output;         /* oid output */
 int         data_output;        /* data output */
 int         attr_data_output;   /* attribute data output */
+int         compound_data;
+
 unsigned    packed_bits_num;    /* number of packed bits to display */
 unsigned    packed_data_offset; /* offset of packed bits to display */
 unsigned    packed_data_length; /* length of packed bits to display */
 unsigned long long packed_data_mask;  /* mask in which packed bits to display */
+
 int         enable_error_stack = 0;   /* re-enable error stack; disable=0 enable=1 */
 
 /* sort parameters */
-H5_index_t   sort_by           = H5_INDEX_NAME; /*sort_by [creation_order | name]  */
-H5_iter_order_t sort_order     = H5_ITER_INC; /*sort_order [ascending | descending]   */
+H5_index_t      sort_by        = H5_INDEX_NAME; /* sort_by [creation_order | name]  */
+H5_iter_order_t sort_order     = H5_ITER_INC;   /* sort_order [ascending | descending] */
 
 /* module-scoped variables */
 static int  h5tools_init_g;     /* if h5tools lib has been initialized */
 
-/* Names of VFDs */
-static const char *drivernames[]={
+/* Names of VFDs. These names are always available so that
+ * the tools can emit special messages when a VFD is asked
+ * for by name but is not compiled into the library or is
+ * somehow otherwise not enabled.
+ *
+ */
+const char *drivernames[] = {
     "sec2",
+    "direct",
+    "log",
+    "windows",
+    "stdio",
+    "core",
     "family",
     "split",
     "multi",
-#ifdef H5_HAVE_PARALLEL
     "mpio",
-#endif /* H5_HAVE_PARALLEL */
+    "ros3",
+    "hdfs",
 };
 
-/* This enum should match the entries in the above drivers_list since they
- * are indexes into the drivers_list array. */
-typedef enum {
-    SEC2_IDX = 0
-   ,FAMILY_IDX
-   ,SPLIT_IDX
-   ,MULTI_IDX
-#ifdef H5_HAVE_PARALLEL
-   ,MPIO_IDX
-#endif /* H5_HAVE_PARALLEL */
-} driver_idx;
 #define NUM_DRIVERS     (sizeof(drivernames) / sizeof(drivernames[0]))
 
 /*-------------------------------------------------------------------------
@@ -97,6 +105,10 @@ typedef enum {
 void
 h5tools_init(void)
 {
+    /* Disable error reporting */
+    H5Eget_auto2(H5E_DEFAULT, &lib_func, &lib_edata);
+    H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
+
     if (!h5tools_init_g) {
         H5TOOLS_INIT_ERROR();
 
@@ -115,6 +127,29 @@ h5tools_init(void)
 
         h5tools_init_g++;
     }
+
+    /* Disable tools error reporting */
+    H5Eget_auto2(H5tools_ERR_STACK_g, &tools_func, &tools_edata);
+    H5Eset_auto2(H5tools_ERR_STACK_g, NULL, NULL);
+}
+
+/*-------------------------------------------------------------------------
+ * Function: h5tools_error_report
+ *
+ * Purpose:  Enable error stack reporting after command line is parsed.
+ *
+ * Return:   None
+ *-------------------------------------------------------------------------
+ */
+void
+h5tools_error_report(void)
+{
+    if (h5tools_init_g) {
+        if (enable_error_stack > 0) {
+            H5Eset_auto2(H5E_DEFAULT, lib_func, lib_edata);
+            H5Eset_auto2(H5tools_ERR_STACK_g, tools_func, tools_edata);
+        }
+    }
 }
 
 /*-------------------------------------------------------------------------
@@ -131,16 +166,14 @@ h5tools_init(void)
 void
 h5tools_close(void)
 {
-    H5E_auto2_t         tools_func;
-    void               *tools_edata;
     if (h5tools_init_g) {
         /* special case where only data is output to stdout */
-        if((rawoutstream == NULL) && rawdatastream && (rawdatastream == stdout))
+        if ((rawoutstream == NULL) && rawdatastream && (rawdatastream == stdout))
             HDfprintf(rawdatastream, "\n");
 
-        H5Eget_auto2(H5tools_ERR_STACK_g, &tools_func, &tools_edata);
-        if(tools_func!=NULL)
+        if (tools_func)
             H5Eprint2(H5tools_ERR_STACK_g, rawerrorstream);
+
         if (rawattrstream && rawattrstream != stdout) {
             if (fclose(rawattrstream))
                 perror("closing rawattrstream");
@@ -175,6 +208,10 @@ h5tools_close(void)
         /* Clean up the reference path table, if it's been used */
         term_ref_path_table();
 
+        /* Restore error stacks from init */
+        H5Eset_auto2(H5tools_ERR_STACK_g, tools_func, tools_edata);
+        H5Eset_auto2(H5E_DEFAULT, lib_func, lib_edata);
+
         H5TOOLS_CLOSE_ERROR();
 
         /* Shut down the library */
@@ -425,189 +462,337 @@ h5tools_set_error_file(const char *fname, int is_bin)
 }
 
 /*-------------------------------------------------------------------------
- * Function: h5tools_get_fapl
+ * Function: h5tools_set_fapl_vfd
  *
- * Purpose:  Get a FAPL for a given VFL driver name.
+ * Purpose:  Given a VFL driver name, sets the appropriate driver on the
+ *           specified FAPL.
  *
  * Return:   positive - succeeded
  *           negative - failed
  *-------------------------------------------------------------------------
  */
-static hid_t
-h5tools_get_fapl(hid_t fapl, const char *driver, unsigned *drivernum)
+static herr_t
+h5tools_set_fapl_vfd(hid_t fapl_id, h5tools_vfd_info_t *vfd_info)
 {
-    hid_t  new_fapl = H5I_INVALID_HID; /* Copy of file access property list passed in, or new property list */
     herr_t ret_value = SUCCEED;
 
-    /* Make a copy of the FAPL, for the file open call to use, eventually */
-    if (fapl == H5P_DEFAULT) {
-        if ((new_fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
-            H5TOOLS_GOTO_ERROR(FAIL, "H5Pcreate failed");
-    } /* end if */
-    else {
-        if ((new_fapl = H5Pcopy(fapl)) < 0)
-            H5TOOLS_GOTO_ERROR(FAIL, "H5Pcopy failed");
-    } /* end else */
-
-    /* Determine which driver the user wants to open the file with. Try
-     * that driver. If it can't open it, then fail. */
-    if (!HDstrcmp(driver, drivernames[SEC2_IDX])) {
-        /* SEC2 driver */
-        if (H5Pset_fapl_sec2(new_fapl) < 0)
+    /* Determine which driver the user wants to open the file with */
+    if (!HDstrcmp(vfd_info->name, drivernames[SEC2_VFD_IDX])) {
+        /* SEC2 Driver */
+        if (H5Pset_fapl_sec2(fapl_id) < 0)
             H5TOOLS_GOTO_ERROR(FAIL, "H5Pset_fapl_sec2 failed");
+    }
+    else if (!HDstrcmp(vfd_info->name, drivernames[DIRECT_VFD_IDX])) {
+#ifdef H5_HAVE_DIRECT
+        /* Direct Driver */
+        if (H5Pset_fapl_direct(fapl_id, 1024, 4096, 8 * 4096) < 0)
+            H5TOOLS_GOTO_ERROR(FAIL, "H5Pset_fapl_direct failed");
+#else
+        H5TOOLS_GOTO_ERROR(FAIL, "Direct VFD is not enabled");
+#endif
+    }
+    else if (!HDstrcmp(vfd_info->name, drivernames[LOG_VFD_IDX])) {
+        unsigned long long log_flags = H5FD_LOG_LOC_IO | H5FD_LOG_ALLOC;
 
-        if (drivernum)
-            *drivernum = SEC2_IDX;
+        /* Log Driver */
+        if (H5Pset_fapl_log(fapl_id, NULL, log_flags, (size_t) 0) < 0)
+            H5TOOLS_GOTO_ERROR(FAIL, "H5Pset_fapl_log failed");
+    }
+    else if (!HDstrcmp(vfd_info->name, drivernames[WINDOWS_VFD_IDX])) {
+#ifdef H5_HAVE_WINDOWS
+        /* There is no Windows VFD - use SEC2 */
+        if (H5Pset_fapl_sec2(fapl_id) < 0)
+            H5TOOLS_GOTO_ERROR(FAIL, "H5Pset_fapl_sec2 failed");
+#else
+        H5TOOLS_GOTO_ERROR(FAIL, "Windows VFD is not enabled");
+#endif
+    }
+    else if (!HDstrcmp(vfd_info->name, drivernames[STDIO_VFD_IDX])) {
+        /* Stdio Driver */
+        if (H5Pset_fapl_stdio(fapl_id) < 0)
+            H5TOOLS_GOTO_ERROR(FAIL, "H5Pset_fapl_stdio failed");
+    }
+    else if (!HDstrcmp(vfd_info->name, drivernames[CORE_VFD_IDX])) {
+        /* Core Driver */
+        if (H5Pset_fapl_core(fapl_id, (size_t) H5_MB, TRUE) < 0)
+            H5TOOLS_GOTO_ERROR(FAIL, "H5Pset_fapl_core failed");
     }
-    else if (!HDstrcmp(driver, drivernames[FAMILY_IDX])) {
+    else if (!HDstrcmp(vfd_info->name, drivernames[FAMILY_VFD_IDX])) {
         /* FAMILY Driver */
-
         /* Set member size to be 0 to indicate the current first member size
          * is the member size.
          */
-        if (H5Pset_fapl_family(new_fapl, (hsize_t) 0, H5P_DEFAULT) < 0)
+        if (H5Pset_fapl_family(fapl_id, (hsize_t) 0, H5P_DEFAULT) < 0)
             H5TOOLS_GOTO_ERROR(FAIL, "H5Pset_fapl_family failed");
-
-        if (drivernum)
-            *drivernum = FAMILY_IDX;
     }
-    else if (!HDstrcmp(driver, drivernames[SPLIT_IDX])) {
+    else if (!HDstrcmp(vfd_info->name, drivernames[SPLIT_VFD_IDX])) {
         /* SPLIT Driver */
-        if (H5Pset_fapl_split(new_fapl, "-m.h5", H5P_DEFAULT, "-r.h5", H5P_DEFAULT) < 0)
+        if (H5Pset_fapl_split(fapl_id, "-m.h5", H5P_DEFAULT, "-r.h5", H5P_DEFAULT) < 0)
             H5TOOLS_GOTO_ERROR(FAIL, "H5Pset_fapl_split failed");
-
-        if (drivernum)
-            *drivernum = SPLIT_IDX;
     }
-    else if (!HDstrcmp(driver, drivernames[MULTI_IDX])) {
+    else if (!HDstrcmp(vfd_info->name, drivernames[MULTI_VFD_IDX])) {
         /* MULTI Driver */
-        if (H5Pset_fapl_multi(new_fapl, NULL, NULL, NULL, NULL, TRUE) < 0)
+        if (H5Pset_fapl_multi(fapl_id, NULL, NULL, NULL, NULL, TRUE) < 0)
             H5TOOLS_GOTO_ERROR(FAIL, "H5Pset_fapl_multi failed");
-
-        if(drivernum)
-            *drivernum = MULTI_IDX;
     }
+    else if (!HDstrcmp(vfd_info->name, drivernames[MPIO_VFD_IDX])) {
 #ifdef H5_HAVE_PARALLEL
-    else if(!HDstrcmp(driver, drivernames[MPIO_IDX])) {
         int mpi_initialized, mpi_finalized;
 
         /* MPI-I/O Driver */
+
         /* check if MPI is available. */
         MPI_Initialized(&mpi_initialized);
         MPI_Finalized(&mpi_finalized);
 
-        if(mpi_initialized && !mpi_finalized) {
-            if(H5Pset_fapl_mpio(new_fapl, MPI_COMM_WORLD, MPI_INFO_NULL) < 0)
+        if (mpi_initialized && !mpi_finalized) {
+            if (H5Pset_fapl_mpio(fapl_id, MPI_COMM_WORLD, MPI_INFO_NULL) < 0)
                 H5TOOLS_GOTO_ERROR(FAIL, "H5Pset_fapl_mpio failed");
-            if(drivernum)
-                *drivernum = MPIO_IDX;
-        } /* end if */
-    }
+        }
+#else
+        H5TOOLS_GOTO_ERROR(FAIL, "MPI-I/O VFD is not enabled");
 #endif /* H5_HAVE_PARALLEL */
+    }
+    else if (!HDstrcmp(vfd_info->name, drivernames[ROS3_VFD_IDX])) {
+#ifdef H5_HAVE_ROS3_VFD
+        if (!vfd_info->info)
+            H5TOOLS_GOTO_ERROR(FAIL, "Read-only S3 VFD info is invalid");
+        if (H5Pset_fapl_ros3(fapl_id, (H5FD_ros3_fapl_t *)vfd_info->info) < 0)
+            H5TOOLS_GOTO_ERROR(FAIL, "H5Pset_fapl_ros3() failed");
+#else
+        H5TOOLS_GOTO_ERROR(FAIL, "Read-only S3 VFD is not enabled");
+#endif
+    }
+    else if (!HDstrcmp(vfd_info->name, drivernames[HDFS_VFD_IDX])) {
+#ifdef H5_HAVE_LIBHDFS
+        if (!vfd_info->info)
+            H5TOOLS_GOTO_ERROR(FAIL, "HDFS VFD info is invalid");
+        if (H5Pset_fapl_hdfs(fapl_id, (H5FD_hdfs_fapl_t *)vfd_info->info) < 0)
+            H5TOOLS_GOTO_ERROR(FAIL, "H5Pset_fapl_hdfs() failed");
+#else
+        H5TOOLS_GOTO_ERROR(FAIL, "The HDFS VFD is not enabled");
+#endif
+    }
     else
-        ret_value = -1;
+        H5TOOLS_GOTO_ERROR(FAIL, "invalid VFD name");
 
 done:
-    if((new_fapl != H5P_DEFAULT) && (ret_value < 0)) {
-        H5Pclose(new_fapl);
-        new_fapl = H5I_INVALID_HID;
+    return ret_value;
+}
+
+/*-------------------------------------------------------------------------
+ * Function: h5tools_get_fapl
+ *
+ * Purpose:  Copies an input fapl and then sets a VFD on it.
+ *
+ *           The returned fapl must be closed by the caller.
+ *
+ * Return:   positive - succeeded
+ *           negative - failed
+ *-------------------------------------------------------------------------
+ */
+hid_t
+h5tools_get_fapl(hid_t prev_fapl_id, h5tools_vfd_info_t *vfd_info)
+{
+    hid_t new_fapl_id = H5I_INVALID_HID;
+    hid_t ret_value = H5I_INVALID_HID;
+
+    if (prev_fapl_id < 0)
+        H5TOOLS_GOTO_ERROR(FAIL, "invalid FAPL");
+
+    /* Make a copy of the FAPL or create one if H5P_DEFAULT is specified. */
+    if (H5P_DEFAULT == prev_fapl_id) {
+        if ((new_fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0)
+            H5TOOLS_GOTO_ERROR(H5I_INVALID_HID, "H5Pcreate failed");
+    }
+    else {
+        if ((new_fapl_id = H5Pcopy(prev_fapl_id)) < 0)
+            H5TOOLS_GOTO_ERROR(H5I_INVALID_HID, "H5Pcopy failed");
+    }
+
+    /* Set non-default virtual file driver, if requested */
+    if (vfd_info)
+        if (h5tools_set_fapl_vfd(new_fapl_id, vfd_info) < 0)
+            H5TOOLS_GOTO_ERROR(H5I_INVALID_HID, "failed to set VFD on FAPL");
+
+    ret_value = new_fapl_id;
+
+done:
+    if ((new_fapl_id >= 0) && (ret_value < 0)) {
+        H5Pclose(new_fapl_id);
+        new_fapl_id = H5I_INVALID_HID;
+    }
+
+    return ret_value;
+}
+
+/*-------------------------------------------------------------------------
+ * Function: h5tools_get_vfd_name
+ *
+ * Purpose:  Given a FAPL, retrieves the name of the VFL driver set on it
+ *           if using a native-terminal VOL connector. If a
+ *           non-native-terminal VOL connector is set on the FAPL, the
+ *           first byte of the returned driver name will be set to the null
+ *           terminator.
+ *
+ * Return:   SUCCEED/FAIL
+ *-------------------------------------------------------------------------
+ */
+herr_t
+h5tools_get_vfd_name(hid_t fapl_id, char *drivername, size_t drivername_size)
+{
+    hid_t  fapl_vol_id = H5I_INVALID_HID;
+    herr_t ret_value = SUCCEED;
+
+    if (fapl_id < 0)
+        H5TOOLS_GOTO_ERROR(FAIL, "invalid FAPL");
+    if (!drivername)
+        H5TOOLS_GOTO_ERROR(FAIL, "drivername is NULL");
+    if (drivername && !drivername_size)
+        H5TOOLS_GOTO_ERROR(FAIL, "drivername_size must be non-zero");
+
+    /* Initialize the driver name */
+    drivername[0] = '\0';
+
+    if (fapl_id == H5P_DEFAULT)
+        fapl_id = H5P_FILE_ACCESS_DEFAULT;
+
+    if (fapl_id >= 0) {
+        const char *driver_name;
+        hid_t       driver_id;
+
+        if ((driver_id = H5Pget_driver(fapl_id)) < 0)
+            H5TOOLS_GOTO_ERROR(FAIL, "failed to retrieve VFL driver ID from FAPL");
+
+        if (driver_id == H5FD_SEC2)
+            driver_name = drivernames[SEC2_VFD_IDX];
+#ifdef H5_HAVE_DIRECT
+        else if (driver_id == H5FD_DIRECT)
+            driver_name = drivernames[DIRECT_VFD_IDX];
+#endif
+        else if (driver_id == H5FD_LOG)
+            driver_name = drivernames[LOG_VFD_IDX];
+#ifdef H5_HAVE_WINDOWS
+        else if (driver_id == H5FD_WINDOWS)
+            driver_name = drivernames[WINDOWS_VFD_IDX];
+#endif
+        else if (driver_id == H5FD_STDIO)
+            driver_name = drivernames[STDIO_VFD_IDX];
+        else if (driver_id == H5FD_CORE)
+            driver_name = drivernames[CORE_VFD_IDX];
+        else if (driver_id == H5FD_FAMILY)
+            driver_name = drivernames[FAMILY_VFD_IDX];
+        else if (driver_id == H5FD_MULTI)
+            driver_name = drivernames[MULTI_VFD_IDX];
+#ifdef H5_HAVE_PARALLEL
+        else if (driver_id == H5FD_MPIO)
+            driver_name = drivernames[MPIO_VFD_IDX];
+#endif
+#ifdef H5_HAVE_ROS3_VFD
+        else if (driver_id == H5FD_ROS3)
+            driver_name = drivernames[ROS3_VFD_IDX];
+#endif
+#ifdef H5_HAVE_LIBHDFS
+        else if (driver_id == H5FD_HDFS)
+            driver_name = drivernames[HDFS_VFD_IDX];
+#endif
+        else
+            driver_name = "unknown";
+
+        HDstrncpy(drivername, driver_name, drivername_size);
+        drivername[drivername_size - 1] = '\0';
     }
 
-    return(new_fapl);
+done:
+
+    return ret_value;
 }
 
 /*-------------------------------------------------------------------------
  * Function: h5tools_fopen
  *
- * Purpose:  Loop through the various types of VFL drivers trying to open FNAME.
- *      If the HDF5 library is version 1.2 or less, then we have only the SEC2
- *      driver to try out. If the HDF5 library is greater than version 1.2,
- *      then we have the FAMILY, SPLIT, and MULTI drivers to play with.
+ * Purpose:  Opens file FNAME using the specified flags and FAPL.
  *
- *      If DRIVER is non-NULL, then it will try to open the file with that
- *      driver first. We assume that the user knows what they are doing so, if
- *      we fail, then we won't try other file drivers.
+ *           The 'use_specific_driver' parameter is used to control the
+ *           VFD connector that this routine uses to open the file
+ *           with. If 'use_specific_driver' is set to TRUE, this routine
+ *           assumes that the caller has already set a specific VFD
+ *           connector on the given FAPL and will attempt to directly use
+ *           the FAPL for opening the file. We assume that the caller knows
+ *           what they are doing; if the file is unable to be opened using
+ *           that FAPL, this routine will return H5I_INVALID_HID.
+ *
+ *           However, if 'use_specific_driver' is set to FALSE, this
+ *           routine assumes that the caller HAS NOT set a specific VFD
+ *           connector on the given FAPL and will instead loop through
+ *           the various available VFL drivers and VOL connectors trying to
+ *           open FNAME.
+ *
+ *           The list of available VFL drivers is as follows:
+ *             - If the HDF5 library is version 1.2 or less, then we have
+ *               only the SEC2 driver to try out.
+ *             - If the HDF5 library is greater than version 1.2, then we
+ *               have the FAMILY, SPLIT, and MULTI drivers to play with.
  *
  * Return:
- *      On success, returns a file id for the opened file. If DRIVERNAME is
+ *      On success, returns a file ID for the opened file. If DRIVERNAME is
  *      non-null then the first DRIVERNAME_SIZE-1 characters of the driver
  *      name are copied into the DRIVERNAME array and null terminated.
  *
- *      Otherwise, the function returns FAIL. If DRIVERNAME is non-null then
- *      the first byte is set to the null terminator.
+ *      On failure, the function returns H5I_INVALID_HID and DRIVERNAME
+ *      will not be set.
  *-------------------------------------------------------------------------
  */
 hid_t
-h5tools_fopen(const char *fname, unsigned flags, hid_t fapl, const char *driver,
+h5tools_fopen(const char *fname, unsigned flags, hid_t fapl_id, hbool_t use_specific_driver,
     char *drivername, size_t drivername_size)
 {
-    unsigned    drivernum;
-    hid_t       fid = FAIL;
-    hid_t       my_fapl = H5P_DEFAULT;
-
-    if (driver && *driver) {
-        /* Get the correct FAPL for the given driver */
-        if ((my_fapl = h5tools_get_fapl(fapl, driver, &drivernum)) < 0)
-            goto done;
-
-        /* allow error stack display if enable-error-stack has optional arg number */
-        if (enable_error_stack > 1) {
-            fid = H5Fopen(fname, flags, my_fapl);
-        }
-        else {
-            H5E_BEGIN_TRY {
-                fid = H5Fopen(fname, flags, my_fapl);
-            } H5E_END_TRY;
-        }
+    hid_t    fid = H5I_INVALID_HID;
+    hid_t    tmp_fapl_id = H5I_INVALID_HID;
+    hid_t    used_fapl_id = H5I_INVALID_HID;
+    hid_t    ret_value = H5I_INVALID_HID;
 
-        if (fid == FAIL)
-            goto done;
+    /*
+     * First try to open the file using just the given FAPL.
+     */
 
+    /* Allow error stack display if --enable-error-stack has optional arg number */
+    if (enable_error_stack > 1) {
+        fid = H5Fopen(fname, flags, fapl_id);
     }
     else {
-        /* Try to open the file using each of the drivers */
-        for (drivernum = 0; drivernum < NUM_DRIVERS; drivernum++) {
-            /* Get the correct FAPL for the given driver */
-            if((my_fapl = h5tools_get_fapl(fapl, drivernames[drivernum], NULL)) < 0)
-                goto done;
-
-            /* allow error stack display if enable-error-stack has optional arg number */
-            if (enable_error_stack > 1) {
-                fid = H5Fopen(fname, flags, my_fapl);
-            }
-            else {
-                H5E_BEGIN_TRY {
-                    fid = H5Fopen(fname, flags, my_fapl);
-                } H5E_END_TRY;
-            }
-
-            if (fid != FAIL)
-                break;
-            else {
-                /* Close the FAPL */
-                H5Pclose(my_fapl);
-                my_fapl = H5P_DEFAULT;
-            } /* end else */
-        }
+        H5E_BEGIN_TRY {
+            fid = H5Fopen(fname, flags, fapl_id);
+        } H5E_END_TRY;
     }
 
-    /* Save the driver name */
-    if (drivername && drivername_size) {
-        if (fid != FAIL) {
-            HDstrncpy(drivername, drivernames[drivernum], drivername_size);
-            drivername[drivername_size - 1] = '\0';
-        }
-        else {
-            /*no file opened*/
-            drivername[0] = '\0';
-        }
+    /* If we succeeded in opening the file, we're done. */
+    if (fid >= 0) {
+        used_fapl_id = fapl_id;
+        H5TOOLS_GOTO_DONE(fid);
     }
 
+    /*
+     * If we failed to open the file and the caller specified 'use_specific_driver'
+     * as TRUE, we should return failure now since the file couldn't be opened with
+     * the VFL driver that was set on the FAPL by the caller.
+     */
+    if (fid < 0 && use_specific_driver)
+        H5TOOLS_GOTO_ERROR(H5I_INVALID_HID, "failed to open file using specified FAPL");
+
+    /* File was unable to be opened at all */
+    ret_value = H5I_INVALID_HID;
+
 done:
-    if(my_fapl != H5P_DEFAULT)
-        H5Pclose(my_fapl);
+    /* Save the driver name */
+    if (drivername && drivername_size && ret_value >= 0)
+        if (used_fapl_id >= 0 && h5tools_get_vfd_name(used_fapl_id, drivername, drivername_size) < 0)
+            H5TOOLS_ERROR(H5I_INVALID_HID, "failed to retrieve name of VFD used to open file");
+
+    if (tmp_fapl_id >= 0)
+        H5Pclose(tmp_fapl_id);
 
-    return fid;
+    return ret_value;
 }
 
 /*-------------------------------------------------------------------------
@@ -733,8 +918,8 @@ done:
  *-------------------------------------------------------------------------
  */
 void
-h5tools_simple_prefix(FILE *stream, const h5tool_format_t *info,
-                      h5tools_context_t *ctx, hsize_t elmtno, int secnum)
+h5tools_simple_prefix(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx,
+        hsize_t elmtno, int secnum)
 {
     h5tools_str_t prefix;
     h5tools_str_t str;          /*temporary for indentation */
@@ -762,7 +947,7 @@ h5tools_simple_prefix(FILE *stream, const h5tool_format_t *info,
     H5TOOLS_DEBUG("after CR elmtno=%ld, ctx->ndims=%d", elmtno, ctx->ndims);
 
     /* Calculate new prefix */
-    h5tools_str_prefix(&prefix, info, elmtno, ctx->ndims, ctx);
+    h5tools_str_prefix(&prefix, info, elmtno, ctx);
     H5TOOLS_DEBUG("prefix=%s - str=%s", prefix.s, str.s);
 
     /* Write new prefix to output */
@@ -829,8 +1014,8 @@ h5tools_simple_prefix(FILE *stream, const h5tool_format_t *info,
  *-------------------------------------------------------------------------
  */
 void
-h5tools_region_simple_prefix(FILE *stream, const h5tool_format_t *info,
-        h5tools_context_t *ctx, hsize_t elmtno, hsize_t *ptdata, int secnum)
+h5tools_region_simple_prefix(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx,
+        hsize_t elmtno, hsize_t *ptdata, int secnum)
 {
     h5tools_str_t prefix;
     h5tools_str_t str;       /*temporary for indentation */
@@ -854,7 +1039,7 @@ h5tools_region_simple_prefix(FILE *stream, const h5tool_format_t *info,
     }
 
     /* Calculate new prefix */
-    h5tools_str_region_prefix(&prefix, info, elmtno, ptdata, ctx->ndims, ctx->p_max_idx, ctx);
+    h5tools_str_region_prefix(&prefix, info, elmtno, ptdata, ctx);
 
     /* Write new prefix to output */
     if (ctx->indent_level > 0)
@@ -927,9 +1112,8 @@ h5tools_region_simple_prefix(FILE *stream, const h5tool_format_t *info,
  *-------------------------------------------------------------------------
  */
 hbool_t
-h5tools_render_element(FILE *stream, const h5tool_format_t *info,
-        h5tools_context_t *ctx, h5tools_str_t *buffer, hsize_t *curr_pos,
-        size_t ncols, hsize_t local_elmt_counter, hsize_t elmt_counter)
+h5tools_render_element(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx,
+        h5tools_str_t *buffer, hsize_t *curr_pos, size_t ncols, hsize_t local_elmt_counter, hsize_t elmt_counter)
 {
     hbool_t  dimension_break = TRUE;
     char    *s = NULL;
@@ -1098,9 +1282,8 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info,
  *-------------------------------------------------------------------------
  */
 hbool_t
-h5tools_render_region_element(FILE *stream, const h5tool_format_t *info,
-        h5tools_context_t *ctx, h5tools_str_t *buffer, hsize_t *curr_pos,
-        size_t ncols, hsize_t *ptdata, hsize_t local_elmt_counter, hsize_t elmt_counter)
+h5tools_render_region_element(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx,
+        h5tools_str_t *buffer, hsize_t *curr_pos, size_t ncols, hsize_t *ptdata, hsize_t local_elmt_counter, hsize_t elmt_counter)
 {
     hbool_t  dimension_break = TRUE;
     char    *s = NULL;
@@ -1117,8 +1300,10 @@ h5tools_render_region_element(FILE *stream, const h5tool_format_t *info,
      * If the element would split on multiple lines if printed at our
      * current location...
      */
-    if (info->line_multi_new == 1 && (ctx->cur_column + h5tools_count_ncols(s) +
-                    HDstrlen(OPT(info->elmt_suf2, " ")) + HDstrlen(OPT(info->line_suf, ""))) > ncols) {
+    if (info->line_multi_new == 1 &&
+            (ctx->cur_column + h5tools_count_ncols(s) +
+                    HDstrlen(OPT(info->elmt_suf2, " ")) +
+                    HDstrlen(OPT(info->line_suf, ""))) > ncols) {
         if (ctx->prev_multiline) {
             /*
              * ... and the previous element also occupied more than one
@@ -1127,7 +1312,8 @@ h5tools_render_region_element(FILE *stream, const h5tool_format_t *info,
             ctx->need_prefix = TRUE;
         }
         else if ((ctx->prev_prefix_len + h5tools_count_ncols(s) +
-                HDstrlen(OPT(info->elmt_suf2, " ")) + HDstrlen(OPT(info->line_suf, ""))) <= ncols) {
+                HDstrlen(OPT(info->elmt_suf2, " ")) +
+                HDstrlen(OPT(info->line_suf, ""))) <= ncols) {
             /*
              * ...but *could* fit on one line otherwise, then we
              * should end the current line and start this element on its
@@ -1158,7 +1344,9 @@ h5tools_render_region_element(FILE *stream, const h5tool_format_t *info,
      * beginning of the line.
      */
     if (info->line_multi_new == 1 && ctx->prev_multiline &&
-            (ctx->cur_column + h5tools_count_ncols(s) + HDstrlen(OPT(info->elmt_suf2, " ")) + HDstrlen(OPT(info->line_suf, ""))) > ncols)
+            (ctx->cur_column + h5tools_count_ncols(s) +
+            HDstrlen(OPT(info->elmt_suf2, " ")) +
+            HDstrlen(OPT(info->line_suf, ""))) > ncols)
         ctx->need_prefix = TRUE;
 
     /*
@@ -1186,7 +1374,9 @@ h5tools_render_region_element(FILE *stream, const h5tool_format_t *info,
          * this check to happen for the first line
          */
         if ((!info->skip_first || local_elmt_counter) &&
-                (ctx->cur_column + HDstrlen(section) + HDstrlen(OPT(info->elmt_suf2, " ")) + HDstrlen(OPT(info->line_suf, ""))) > ncols)
+                (ctx->cur_column + HDstrlen(section) +
+                        HDstrlen(OPT(info->elmt_suf2, " ")) +
+                        HDstrlen(OPT(info->line_suf, ""))) > ncols)
             ctx->need_prefix = 1;
 
         /*
@@ -1232,27 +1422,65 @@ h5tools_render_region_element(FILE *stream, const h5tool_format_t *info,
  *-------------------------------------------------------------------------
  */
 void
-init_acc_pos(h5tools_context_t *ctx, hsize_t *dims)
+init_acc_pos(unsigned ndims, hsize_t *dims, hsize_t *acc, hsize_t *pos, hsize_t *p_min_idx)
 {
     int i;
     unsigned j;
 
     H5TOOLS_START_DEBUG("");
 
-    if(ctx->ndims > 0) {
-        ctx->acc[ctx->ndims - 1] = 1;
-        for (i = ((int)ctx->ndims - 2); i >= 0; i--) {
-            ctx->acc[i] = ctx->acc[i + 1] * dims[i + 1];
-            H5TOOLS_DEBUG("ctx->acc[%d]=%ld", i, ctx->acc[i]);
+    for (i = 0; (unsigned)i < ndims; i++)
+        p_min_idx[i] = 0;
+
+    if(ndims > 0) {
+        acc[ndims - 1] = 1;
+        for (i = ((int)ndims - 2); i >= 0; i--) {
+            acc[i] = acc[i + 1] * dims[i + 1];
+            H5TOOLS_DEBUG("acc[%d]=%ld", i, acc[i]);
         }
-        for (j = 0; j < ctx->ndims; j++)
-            ctx->pos[j] = 0;
+        for (j = 0; j < ndims; j++)
+            pos[j] = 0;
     }
 
     H5TOOLS_ENDDEBUG("");
 }
 
 /*-------------------------------------------------------------------------
+ * Function: calc_acc_pos
+ *
+ * Purpose:  Calculate the number of elements represented by a unit change
+ *           in a certain index position.
+ *
+ * Return:   void
+ *-------------------------------------------------------------------------
+ */
+hsize_t
+calc_acc_pos(unsigned ndims, hsize_t elmtno, hsize_t *acc, hsize_t *pos)
+{
+    int i;
+    hsize_t   curr_pos = elmtno;
+
+    H5TOOLS_START_DEBUG("");
+
+    if(ndims > 0) {
+        for(i = 0; i < (size_t) ndims; i++) {
+            if(curr_pos > 0) {
+                H5TOOLS_DEBUG("curr_pos=%ld - ctx->acc[%d]=%ld", curr_pos, i, acc[i]);
+                pos[i] = curr_pos / acc[i];
+                curr_pos -= acc[i] * pos[i];
+            }
+            else
+                pos[i] = 0;
+            H5TOOLS_DEBUG("curr_pos=%ld - pos[%d]=%ld - acc[%d]=%ld", curr_pos, i, pos[i], i, acc[i]);
+        }
+    }
+
+    H5TOOLS_ENDDEBUG("");
+
+    return curr_pos;
+}
+
+/*-------------------------------------------------------------------------
  * Function: render_bin_output
  *
  * Purpose:  Write one element of memory buffer to a binary file stream
@@ -1437,19 +1665,24 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem,  hsize_t
 
                         for (block_index = 0; block_index < block_nelmts; block_index++) {
                             mem = ((unsigned char*)_mem) + block_index * size;
-                            region_id = H5Rdereference2(container, H5P_DEFAULT, H5R_DATASET_REGION, mem);
-                            if (region_id >= 0) {
-                                region_space = H5Rget_region(container, H5R_DATASET_REGION, mem);
-                                if (region_space >= 0) {
-                                    region_type = H5Sget_select_type(region_space);
-                                    if(region_type == H5S_SEL_POINTS)
-                                        render_bin_output_region_points(region_space, region_id, stream, container);
-                                    else
-                                        render_bin_output_region_blocks(region_space, region_id, stream, container);
+                            if((region_id = H5Rdereference2(container, H5P_DEFAULT, H5R_DATASET_REGION, mem)) < 0)
+                                H5TOOLS_INFO("H5Ropen_object H5T_STD_REF failed");
+                            else {
+                                if((region_space = H5Rget_region(container, H5R_DATASET_REGION, mem)) >= 0) {
+                                    if (!h5tools_is_zero(mem, H5R_DSET_REG_REF_BUF_SIZE)) {
+                                        region_type = H5Sget_select_type(region_space);
+                                        if(region_type == H5S_SEL_POINTS)
+                                            render_bin_output_region_points(region_space, region_id, stream, container);
+                                        else
+                                            render_bin_output_region_blocks(region_space, region_id, stream, container);
+                                    }
+                                    else {
+                                        H5TOOLS_INFO("H5Ropen_object H5T_STD_REF NULL");
+                                    }
                                     H5Sclose(region_space);
                                 } /* end if (region_space >= 0) */
                                 H5Dclose(region_id);
-                            } /* end if (region_id >= 0) */
+                            }
                         }
                     } /* end if (region_output... */
                 }
diff --git a/tools/lib/h5tools.h b/tools/lib/h5tools.h
index 9440e7a..fa0198e 100644
--- a/tools/lib/h5tools.h
+++ b/tools/lib/h5tools.h
@@ -539,20 +539,57 @@ typedef struct h5tools_context_t {
     int display_char;                 /* */
 } h5tools_context_t;
 
+/* VFD info structs used to set the file access property
+ * lists in the tools.
+ */
+
+typedef struct h5tools_vfd_info_t {
+
+    /* Pointer to information to be passed to the driver for its setup */
+    const void *info;
+
+    /* Name of the VFD */
+    const char *name;
+} h5tools_vfd_info_t;
+
+/* This enum should match the entries in the above 'drivernames'
+ * since they are indices into the 'drivernames' array. */
+typedef enum {
+    SEC2_VFD_IDX = 0,
+    DIRECT_VFD_IDX,
+    LOG_VFD_IDX,
+    WINDOWS_VFD_IDX,
+    STDIO_VFD_IDX,
+    CORE_VFD_IDX,
+    FAMILY_VFD_IDX,
+    SPLIT_VFD_IDX,
+    MULTI_VFD_IDX,
+    MPIO_VFD_IDX,
+    ROS3_VFD_IDX,
+    HDFS_VFD_IDX,
+} driver_idx;
+
 /* The following include, h5tools_str.h, must be after the
  * above stucts are defined. There is a dependency in the following
  * include that hasn't been identified yet. */
 
 #include "h5tools_str.h"
 
-H5TOOLS_DLLVAR h5tool_format_t h5tools_dataformat;
-H5TOOLS_DLLVAR const h5tools_dump_header_t h5tools_standardformat;
-H5TOOLS_DLLVAR const h5tools_dump_header_t* h5tools_dump_header_format;
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+H5TOOLS_DLLVAR const char *drivernames[];
+
+H5TOOLS_DLLVAR h5tool_format_t h5tools_dataformat;
+H5TOOLS_DLLVAR const h5tools_dump_header_t h5tools_standardformat;
+H5TOOLS_DLLVAR const h5tools_dump_header_t* h5tools_dump_header_format;
+H5TOOLS_DLLVAR H5E_auto2_t lib_func;
+H5TOOLS_DLLVAR H5E_auto2_t tools_func;
+H5TOOLS_DLLVAR void *lib_edata;
+H5TOOLS_DLLVAR void *tools_edata;
+
 H5TOOLS_DLLVAR unsigned packed_bits_num;    /* number of packed bits to display */
 H5TOOLS_DLLVAR unsigned packed_data_offset; /* offset of packed bits to display */
 H5TOOLS_DLLVAR unsigned packed_data_length; /* length of packed bits to display */
@@ -586,48 +623,47 @@ H5TOOLS_DLLVAR int     enable_error_stack; /* re-enable error stack; disable=0 e
 /* Definitions of useful routines */
 H5TOOLS_DLL void    h5tools_init(void);
 H5TOOLS_DLL void    h5tools_close(void);
+
+H5TOOLS_DLL void    h5tools_error_report(void);
 H5TOOLS_DLL int     h5tools_set_data_output_file(const char *fname, int is_bin);
 H5TOOLS_DLL int     h5tools_set_attr_output_file(const char *fname, int is_bin);
 H5TOOLS_DLL int     h5tools_set_input_file(const char *fname, int is_bin);
 H5TOOLS_DLL int     h5tools_set_output_file(const char *fname, int is_bin);
 H5TOOLS_DLL int     h5tools_set_error_file(const char *fname, int is_bin);
+
+H5TOOLS_DLL hid_t   h5tools_get_fapl(hid_t prev_fapl_id, h5tools_vfd_info_t *vfd_info);
+H5TOOLS_DLL herr_t  h5tools_get_vfd_name(hid_t fapl_id,
+                            char *drivername, size_t drivername_size);
 H5TOOLS_DLL hid_t   h5tools_fopen(const char *fname, unsigned flags, hid_t fapl,
-                            const char *driver, char *drivername, size_t drivername_len);
+                            hbool_t use_specific_driver, char *drivername, size_t drivername_size);
 H5TOOLS_DLL hid_t   h5tools_get_little_endian_type(hid_t type);
 H5TOOLS_DLL hid_t   h5tools_get_big_endian_type(hid_t type);
 H5TOOLS_DLL htri_t  h5tools_detect_vlen(hid_t tid);
 H5TOOLS_DLL htri_t  h5tools_detect_vlen_str(hid_t tid);
 H5TOOLS_DLL hbool_t h5tools_is_obj_same(hid_t loc_id1, const char *name1, hid_t loc_id2, const char *name2);
-H5TOOLS_DLL void    init_acc_pos(h5tools_context_t *ctx, hsize_t *dims);
+H5TOOLS_DLL void    init_acc_pos(unsigned ndims, hsize_t *dims, hsize_t *acc, hsize_t *pos, hsize_t *p_min_idx);
+H5TOOLS_DLL hsize_t calc_acc_pos(unsigned ndims, hsize_t elemtno, hsize_t *acc, hsize_t *pos);
 H5TOOLS_DLL hbool_t h5tools_is_zero(const void *_mem, size_t size);
 H5TOOLS_DLL int     h5tools_canreadf(const char* name,  hid_t dcpl_id);
 H5TOOLS_DLL int     h5tools_can_encode(H5Z_filter_t filtn);
 
-H5TOOLS_DLL void    h5tools_simple_prefix(FILE *stream, const h5tool_format_t *info,
-                            h5tools_context_t *ctx, hsize_t elmtno, int secnum);
-H5TOOLS_DLL void    h5tools_region_simple_prefix(FILE *stream, const h5tool_format_t *info,
-                            h5tools_context_t *ctx, hsize_t elmtno, hsize_t *ptdata, int secnum);
+H5TOOLS_DLL void    h5tools_simple_prefix(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx,
+                            hsize_t elmtno, int secnum);
+H5TOOLS_DLL void    h5tools_region_simple_prefix(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx,
+                            hsize_t elmtno, hsize_t *ptdata, int secnum);
 
 H5TOOLS_DLL int     render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem, hsize_t nelmts);
-H5TOOLS_DLL int     render_bin_output_region_data_blocks(hid_t region_id, FILE *stream,
-                            hid_t container, unsigned ndims, hid_t type_id, hsize_t nblocks, hsize_t *ptdata);
-H5TOOLS_DLL hbool_t render_bin_output_region_blocks(hid_t region_space, hid_t region_id,
-                             FILE *stream, hid_t container);
-H5TOOLS_DLL int     render_bin_output_region_data_points(hid_t region_space, hid_t region_id,
-                            FILE* stream, hid_t container, unsigned ndims, hid_t type_id, hsize_t npoints);
-H5TOOLS_DLL hbool_t render_bin_output_region_points(hid_t region_space, hid_t region_id,
-                             FILE *stream, hid_t container);
-
-H5TOOLS_DLL hbool_t h5tools_render_element(FILE *stream, const h5tool_format_t *info,
-                            h5tools_context_t *ctx, h5tools_str_t *buffer, hsize_t *curr_pos,
-                            size_t ncols, hsize_t local_elmt_counter, hsize_t elmt_counter);
-H5TOOLS_DLL hbool_t h5tools_render_region_element(FILE *stream, const h5tool_format_t *info,
-                            h5tools_context_t *ctx, /*in,out*/
-                            h5tools_str_t *buffer,  /*string into which to render */
-                            hsize_t *curr_pos,      /*total data element position*/
-                            size_t ncols, hsize_t *ptdata,
-                            hsize_t local_elmt_counter, /*element counter*/
-                            hsize_t elmt_counter);
+H5TOOLS_DLL int     render_bin_output_region_data_blocks(hid_t region_id, FILE *stream, hid_t container,
+                            unsigned ndims, hid_t type_id, hsize_t nblocks, hsize_t *ptdata);
+H5TOOLS_DLL hbool_t render_bin_output_region_blocks(hid_t region_space, hid_t region_id, FILE *stream, hid_t container);
+H5TOOLS_DLL int     render_bin_output_region_data_points(hid_t region_space, hid_t region_id, FILE* stream, hid_t container,
+                            unsigned ndims, hid_t type_id, hsize_t npoints);
+H5TOOLS_DLL hbool_t render_bin_output_region_points(hid_t region_space, hid_t region_id, FILE *stream, hid_t container);
+
+H5TOOLS_DLL hbool_t h5tools_render_element(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx, h5tools_str_t *buffer,
+                            hsize_t *curr_pos, size_t ncols, hsize_t local_elmt_counter, hsize_t elmt_counter);
+H5TOOLS_DLL hbool_t h5tools_render_region_element(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx, h5tools_str_t *buffer,
+                            hsize_t *curr_pos, size_t ncols, hsize_t *ptdata, hsize_t local_elmt_counter, hsize_t elmt_counter);
 
 #ifdef __cplusplus
 }
diff --git a/tools/lib/h5tools_dump.c b/tools/lib/h5tools_dump.c
index b10e0a7..01c4655 100644
--- a/tools/lib/h5tools_dump.c
+++ b/tools/lib/h5tools_dump.c
@@ -253,9 +253,8 @@ h5tools_dump_init(void)
  *-------------------------------------------------------------------------
  */
 int
-h5tools_dump_simple_data(FILE *stream, const h5tool_format_t *info, hid_t container,
-                         h5tools_context_t *ctx,    /* in,out */
-                         unsigned flags, hsize_t nelmts, hid_t type, void *_mem)
+h5tools_dump_simple_data(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx,    /* in,out */
+                         hid_t container, unsigned flags, hsize_t nelmts, hid_t type, void *_mem)
 {
     unsigned char *mem = (unsigned char*) _mem;
     hsize_t        i;               /* element counter  */
@@ -323,6 +322,146 @@ h5tools_dump_simple_data(FILE *stream, const h5tool_format_t *info, hid_t contai
     return ret_value;
 }
 
+/*-------------------------------------------------------------------------
+ * Audience:    Public
+ * Chapter:     H5Tools Library
+ * Purpose: Print some values from an attribute referenced by object reference.
+ *
+ * Description:
+ *      This is a special case subfunction to dump aa attribute references.
+ *
+ * Return:
+ *      The function returns False if the last dimension has been reached, otherwise True
+ *
+ * In/Out:
+ *      h5tools_context_t *ctx
+ *      hsize_t *curr_pos
+ *
+ * Parameters Description:
+ *      h5tools_str_t *buffer is the string into which to render
+ *      hsize_t curr_pos is the total data element position
+ *      size_t ncols
+ *      hsize_t region_elmt_counter is the region element loop counter
+ *      hsize_t elmt_count is the data element loop counter
+ *-------------------------------------------------------------------------
+ */
+hbool_t
+h5tools_dump_region_attribute(hid_t region_id,
+        FILE *stream, const h5tool_format_t *info,
+        h5tools_context_t *ctx,       /* in,out */
+        h5tools_str_t *buffer,        /* string into which to render */
+        hsize_t *curr_pos,            /* total data element position */
+        size_t ncols, hsize_t region_elmt_counter,    /* element counter */
+        hsize_t elmt_counter)
+{
+    hbool_t         dimension_break = TRUE;
+    hid_t           atype = H5I_INVALID_HID;
+    hid_t           type_id = H5I_INVALID_HID;
+    hid_t           region_space = H5I_INVALID_HID;
+    h5tool_format_t outputformat; /* Use to disable prefix for DATA attribute display */
+    hbool_t         past_catch = FALSE;
+    hbool_t         ret_value = TRUE;
+
+    HDassert(info);
+    HDassert(ctx);
+    HDassert(buffer);
+
+    outputformat = *info;
+    outputformat.idx_fmt   = "";
+    outputformat.idx_n_fmt = "";
+    outputformat.idx_sep   = "";
+    outputformat.line_pre  = "";
+
+    H5TOOLS_DEBUG("enter file=%p", (void*)stream);
+    H5TOOLS_DEBUG("rawdata file=%p", (void*)rawdatastream);
+
+    /* Render the region { element begin */
+    h5tools_str_reset(buffer);
+
+    h5tools_str_append(buffer, " {");
+    dimension_break = h5tools_render_element(stream, &outputformat, ctx, buffer, curr_pos, ncols, region_elmt_counter, elmt_counter);
+    /* Render the region { element end */
+
+    if((region_space = H5Aget_space(region_id)) < 0)
+        H5TOOLS_GOTO_ERROR(dimension_break, "H5Aget_space failed");
+    if((atype = H5Aget_type(region_id)) < 0)
+        H5TOOLS_GOTO_ERROR(dimension_break, "H5Aget_type failed");
+    if((type_id = H5Tget_native_type(atype, H5T_DIR_DEFAULT)) < 0)
+        H5TOOLS_GOTO_ERROR(dimension_break, "H5Tget_native_type failed");
+
+    ctx->indent_level++;
+    ctx->need_prefix = TRUE;
+
+    /* Render the datatype element begin */
+    h5tools_str_reset(buffer);
+    h5tools_str_append(buffer, "%s %s ",
+                        h5tools_dump_header_format->datatypebegin,
+                        h5tools_dump_header_format->datatypeblockbegin);
+
+    ctx->need_prefix = TRUE;
+    ctx->indent_level++;
+    h5tools_print_datatype(stream, buffer, info, ctx, atype, TRUE);
+    ctx->indent_level--;
+
+    if (HDstrlen(h5tools_dump_header_format->datatypeblockend)) {
+        h5tools_str_append(buffer, "%s", h5tools_dump_header_format->datatypeblockend);
+        if (HDstrlen(h5tools_dump_header_format->datatypeend))
+            h5tools_str_append(buffer, " ");
+    }
+    if (HDstrlen(h5tools_dump_header_format->datatypeend))
+        h5tools_str_append(buffer, "%s", h5tools_dump_header_format->datatypeend);
+
+    dimension_break = h5tools_render_element(stream, info, ctx, buffer, curr_pos, ncols, region_elmt_counter, elmt_counter);
+    /* Render the datatype element end */
+
+    ctx->need_prefix = TRUE;
+
+    /* Render the dataspace element begin */
+    h5tools_str_reset(buffer);
+    h5tools_str_append(buffer, "%s ", h5tools_dump_header_format->dataspacebegin);
+
+    h5tools_print_dataspace(buffer, region_space);
+
+    if (HDstrlen(h5tools_dump_header_format->dataspaceblockend)) {
+        h5tools_str_append(buffer, "%s", h5tools_dump_header_format->dataspaceblockend);
+        if (HDstrlen(h5tools_dump_header_format->dataspaceend))
+            h5tools_str_append(buffer, " ");
+    }
+    if (HDstrlen(h5tools_dump_header_format->dataspaceend))
+        h5tools_str_append(buffer, "%s", h5tools_dump_header_format->dataspaceblockend);
+
+    dimension_break = h5tools_render_element(stream, info, ctx, buffer, curr_pos, ncols, region_elmt_counter, elmt_counter);
+    /* Render the dataspace element end */
+
+    if (region_output) {
+        ctx->need_prefix = TRUE;
+
+        h5tools_dump_data(stream, &outputformat, ctx, region_id, FALSE);
+    }
+
+done:
+    if(H5Tclose(type_id) < 0)
+        H5TOOLS_ERROR(dimension_break, "H5Tclose failed");
+
+    if(H5Tclose(atype) < 0)
+        H5TOOLS_ERROR(dimension_break, "H5Tclose failed");
+
+    ctx->indent_level--;
+    ctx->need_prefix = TRUE;
+
+    /* Render the region } element begin */
+    h5tools_str_reset(buffer);
+    h5tools_str_append(buffer, "}");
+    dimension_break = h5tools_render_element(stream, info, ctx, buffer, curr_pos, ncols, region_elmt_counter, elmt_counter);
+    /* Render the region } element end */
+
+    H5_LEAVE(dimension_break)
+
+CATCH
+
+    H5TOOLS_ENDDEBUG("");
+    return ret_value;
+}
 
 /*-------------------------------------------------------------------------
  * Audience:    Public
@@ -428,9 +567,11 @@ h5tools_print_region_data_blocks(hid_t region_id, FILE *stream, const h5tool_for
                 ctx.indent_level++;
                 if(H5Sget_simple_extent_dims(mem_space, total_size, NULL) >= 0) {
                     /* assume entire data space to be printed */
+                    init_acc_pos(ctx.ndims, total_size, ctx.acc, ctx.pos, ctx.p_min_idx);
+
+                    /* reset data space to be printed */
                     for (indx = 0; indx < (unsigned)ctx.ndims; indx++)
                         ctx.p_min_idx[indx] = start[indx];
-                    init_acc_pos(&ctx, total_size);
 
                     /* print the data */
                     region_flags = START_OF_DATA;
@@ -799,9 +940,7 @@ h5tools_print_region_data_points(hid_t region_space, hid_t region_id,
 
         if(H5Sget_simple_extent_dims(mem_space, total_size, NULL) >= 0) {
             /* assume entire data space to be printed */
-            for (indx = 0; indx < ctx.ndims; indx++)
-                ctx.p_min_idx[indx] = 0;
-            init_acc_pos(&ctx, total_size);
+            init_acc_pos(ctx.ndims, total_size, ctx.acc, ctx.pos, ctx.p_min_idx);
 
             /* print the data */
             region_flags = START_OF_DATA;
@@ -1113,7 +1252,6 @@ h5tools_print_simple_subset(FILE *stream, const h5tool_format_t *info, h5tools_c
     size_t            j;                       /* counters  */
     hsize_t           zero[1] = {0};           /* vector of zeros */
     unsigned int      flags;                   /* buffer extent flags */
-    hsize_t           elmtno;                  /* elemnt index  */
     hsize_t           low[H5S_MAX_RANK];       /* low bound of hyperslab */
     hsize_t           high[H5S_MAX_RANK];      /* higher bound of hyperslab */
     size_t            p_type_nbytes;           /* size of memory type */
@@ -1134,9 +1272,6 @@ h5tools_print_simple_subset(FILE *stream, const h5tool_format_t *info, h5tools_c
     if ((size_t) ctx->ndims > NELMTS(sm_size))
         H5TOOLS_THROW(FAIL, "ndims and sm_size comparision failed");
 
-    if (ctx->ndims > 0)
-        init_acc_pos(ctx, total_size);
-
     size_row_block = ctx->sset->block.data[row_dim];
 
     /* Check if we have VL data in the dataset's datatype */
@@ -1207,27 +1342,25 @@ h5tools_print_simple_subset(FILE *stream, const h5tool_format_t *info, h5tools_c
             for (i = 0; i < ctx->ndims; i++)
                 ctx->p_max_idx[i] = ctx->p_min_idx[i] + MIN(total_size[i], sm_size[i]);
 
-            /* print array indices. get the lower bound of the hyperslab and calulate
-             the element position at the start of hyperslab */
+            /* print array indices. get the lower bound of the hyperslab and calculate
+               the element position at the start of hyperslab */
             if(H5Sget_select_bounds(f_space, low, high) < 0)
                 H5TOOLS_THROW(FAIL, "H5Sget_select_bounds failed");
 
-            elmtno = 0;
+            /* initialize the current stripmine position; this is necessary to print the array indices */
+            ctx->sm_pos = 0;
             for (i = 0; i < (size_t) ctx->ndims - 1; i++) {
                 hsize_t offset = 1; /* accumulation of the previous dimensions */
                 for (j = i + 1; j < (size_t) ctx->ndims; j++)
                     offset *= total_size[j];
-                elmtno += low[i] * offset;
+                ctx->sm_pos += low[i] * offset;
             }
-            elmtno += low[ctx->ndims - 1];
+            ctx->sm_pos += low[ctx->ndims - 1];
 
-            /* initialize the current stripmine position; this is necessary to print the array
-             indices */
-            ctx->sm_pos = elmtno;
 
             ctx->need_prefix = TRUE;
 
-            if(h5tools_dump_simple_data(stream, info, dset, ctx, flags, sm_nelmts, p_type, sm_buf) < 0)
+            if(h5tools_dump_simple_data(stream, info, ctx, dset, flags, sm_nelmts, p_type, sm_buf) < 0)
                 H5TOOLS_THROW(FAIL, "h5tools_dump_simple_data failed");
 
             /* Reclaim any VL memory, if necessary */
@@ -1432,7 +1565,6 @@ h5tools_dump_simple_subset(FILE *stream, const h5tool_format_t *info, h5tools_co
 {
     int     sndims;
     hid_t   f_space = H5I_INVALID_HID;            /* file data space */
-    size_t  i;                       /* counters  */
     hsize_t total_size[H5S_MAX_RANK];/* total size of dataset*/
     hbool_t past_catch = FALSE;
     herr_t  ret_value = SUCCEED;
@@ -1446,12 +1578,10 @@ h5tools_dump_simple_subset(FILE *stream, const h5tool_format_t *info, h5tools_co
     ctx->ndims = (unsigned)sndims;
 
     /* assume entire data space to be printed */
-    if (ctx->ndims > 0)
-        for (i = 0; i < (size_t) ctx->ndims; i++)
-            ctx->p_min_idx[i] = 0;
-
     if(H5Sget_simple_extent_dims(f_space, total_size, NULL) < 0)
         H5TOOLS_THROW(FAIL, "H5Sget_simple_extent_dims failed");
+    init_acc_pos(ctx->ndims, total_size, ctx->acc, ctx->pos, ctx->p_min_idx);
+
     ctx->size_last_dim = total_size[ctx->ndims - 1];
 
     /* Set the compound datatype field list for display */
@@ -1483,38 +1613,37 @@ CATCH
  *-------------------------------------------------------------------------
  */
 static int
-h5tools_dump_simple_dset(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx,
-                         hid_t dset, hid_t p_type)
+h5tools_dump_simple_dset(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx, hid_t dset, hid_t p_type)
 {
-    hid_t               f_space = H5I_INVALID_HID;                  /* file data space */
-    hsize_t             elmtno;                   /* counter  */
-    size_t              i;                        /* counter  */
-    int                 sndims;                   /* rank of dataspace */
-    int                 carry;                    /* counter carry value */
-    hsize_t             zero[8];                  /* vector of zeros */
-    unsigned int        flags;                    /* buffer extent flags */
-    hsize_t             total_size[H5S_MAX_RANK]; /* total size of dataset*/
-    hbool_t             past_catch = FALSE;
+    hid_t            f_space = H5I_INVALID_HID; /* file data space */
+    hsize_t          elmtno;                    /* counter  */
+    size_t           i = 0;                     /* counter  */
+    int              sndims;                    /* rank of dataspace */
+    int              carry;                     /* counter carry value */
+    hsize_t          zero[8];                   /* vector of zeros */
+    unsigned int     flags;                     /* buffer extent flags */
+    hsize_t          total_size[H5S_MAX_RANK];  /* total size of dataset*/
+    hbool_t          past_catch = FALSE;
 
     /* Print info */
-    size_t              p_type_nbytes;            /* size of memory type */
-    hsize_t             p_nelmts;                 /* total selected elmts */
+    size_t           p_type_nbytes;             /* size of memory type */
+    hsize_t          p_nelmts;                  /* total selected elmts */
 
     /* Stripmine info */
-    hsize_t             sm_size[H5S_MAX_RANK];    /* stripmine size */
-    hsize_t             sm_nbytes;                /* bytes per stripmine */
-    hsize_t             sm_nelmts;                /* elements per stripmine*/
-    unsigned char      *sm_buf = NULL;            /* buffer for raw data */
-    hid_t               sm_space = H5I_INVALID_HID;                 /* stripmine data space */
+    hsize_t          sm_size[H5S_MAX_RANK];     /* stripmine size */
+    hsize_t          sm_nbytes;                 /* bytes per stripmine */
+    hsize_t          sm_nelmts;                 /* elements per stripmine*/
+    unsigned char   *sm_buf = NULL;             /* buffer for raw data */
+    hid_t            sm_space = H5I_INVALID_HID; /* stripmine data space */
 
     /* Hyperslab info */
-    hsize_t             hs_offset[H5S_MAX_RANK];  /* starting offset */
-    hsize_t             hs_size[H5S_MAX_RANK];    /* size this pass */
-    hsize_t             hs_nelmts;                /* elements in request */
+    hsize_t          hs_offset[H5S_MAX_RANK];   /* starting offset */
+    hsize_t          hs_size[H5S_MAX_RANK];     /* size this pass */
+    hsize_t          hs_nelmts;                 /* elements in request */
 
     /* VL data special information */
-    unsigned int        vl_data = 0; /* contains VL datatypes */
-    int                 ret_value = 0;
+    unsigned int     vl_data = 0;               /* contains VL datatypes */
+    int              ret_value = 0;
 
     H5TOOLS_START_DEBUG("");
     if (H5I_INVALID_HID == (f_space = H5Dget_space(dset)))
@@ -1530,11 +1659,8 @@ h5tools_dump_simple_dset(FILE *stream, const h5tool_format_t *info, h5tools_cont
         H5TOOLS_GOTO_ERROR((-1), "ctx->ndims > NELMTS(sm_size) failed");
 
     /* Assume entire data space to be printed */
-    if (ctx->ndims > 0)
-        for (i = 0; i < (size_t)ctx->ndims; i++)
-            ctx->p_min_idx[i] = 0;
-
     H5Sget_simple_extent_dims(f_space, total_size, NULL);
+    init_acc_pos(ctx->ndims, total_size, ctx->acc, ctx->pos, ctx->p_min_idx);
 
     /* calculate the number of elements we're going to print */
     p_nelmts = 1;
@@ -1580,8 +1706,6 @@ h5tools_dump_simple_dset(FILE *stream, const h5tool_format_t *info, h5tools_cont
         sm_space = H5Screate_simple(1, &sm_nelmts, NULL);
         H5TOOLS_DEBUG("sm_nelmts size:%ld", sm_nelmts);
 
-        if (ctx->ndims > 0)
-            init_acc_pos(ctx, total_size);
         H5TOOLS_DEBUG("ctx->ndims:%d", ctx->ndims);
 
         /* The stripmine loop */
@@ -1622,7 +1746,7 @@ h5tools_dump_simple_dset(FILE *stream, const h5tool_format_t *info, h5tools_cont
                 indices */
                 ctx->sm_pos = elmtno;
 
-                if(h5tools_dump_simple_data(stream, info, dset, ctx, flags, hs_nelmts, p_type, sm_buf) < 0)
+                if(h5tools_dump_simple_data(stream, info, ctx, dset, flags, hs_nelmts, p_type, sm_buf) < 0)
                     H5TOOLS_ERROR((-1), "h5tools_dump_simple_data failed");
 
                 /* Reclaim any VL memory, if necessary */
@@ -1701,11 +1825,8 @@ h5tools_dump_simple_mem(FILE *stream, const h5tool_format_t *info, h5tools_conte
         H5TOOLS_THROW((-1), "ctx->ndims > NELMTS(ctx->p_min_idx) failed");
 
     /* Assume entire data space to be printed */
-    if (ctx->ndims > 0)
-        for (i = 0; i < (size_t)ctx->ndims; i++)
-            ctx->p_min_idx[i] = 0;
-
     H5Sget_simple_extent_dims(f_space, total_size, NULL);
+    init_acc_pos(ctx->ndims, total_size, ctx->acc, ctx->pos, ctx->p_min_idx);
 
     /* calculate the number of elements we're going to print */
     p_nelmts = 1;
@@ -1728,14 +1849,12 @@ h5tools_dump_simple_mem(FILE *stream, const h5tool_format_t *info, h5tools_conte
     alloc_size = p_nelmts * H5Tget_size(p_type);
     HDassert(alloc_size == (hsize_t)((size_t)alloc_size)); /*check for overflow*/
     if (NULL != (buf = (unsigned char *)HDmalloc((size_t)alloc_size))) {
-        if (ctx->ndims > 0)
-            init_acc_pos(ctx, total_size);
         H5TOOLS_DEBUG("ctx->ndims:%d", ctx->ndims);
 
         H5TOOLS_DEBUG("Read the data");
         /* Read the data */
         if (H5Aread(attr_id, p_type, buf) >= 0) {
-            if(h5tools_dump_simple_data(stream, info, attr_id, ctx, START_OF_DATA | END_OF_DATA, p_nelmts, p_type, buf) < 0)
+            if(h5tools_dump_simple_data(stream, info, ctx, attr_id, START_OF_DATA | END_OF_DATA, p_nelmts, p_type, buf) < 0)
                 H5TOOLS_ERROR((-1), "h5tools_dump_simple_data failed");
 
             /* Reclaim any VL memory, if necessary */
@@ -2394,9 +2513,12 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
         if (H5Tequal(type, H5T_STD_REF_DSETREG) == TRUE) {
             h5tools_str_append(buffer, " { H5T_STD_REF_DSETREG }");
         }
-        else {
+        else if (H5Tequal(type, H5T_STD_REF_OBJ) == TRUE) {
             h5tools_str_append(buffer, " { H5T_STD_REF_OBJECT }");
         }
+        else {
+            h5tools_str_append(buffer, " { UNDEFINED }");
+        }
         break;
 
     case H5T_ENUM:
@@ -2959,7 +3081,7 @@ h5tools_print_fill_value(h5tools_str_t *buffer/*in,out*/, const h5tool_format_t
  */
 void
 h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
-        h5tools_context_t *ctx, hid_t dcpl_id, hid_t type_id, hid_t obj_id)
+        h5tools_context_t *ctx, hid_t dcpl_id, hid_t type_id, hid_t dset_id)
 {
     int              nfilters;       /* number of filters */
     int              rank;           /* rank */
@@ -2990,7 +3112,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
     if (info->line_ncols > 0)
         ncols = info->line_ncols;
 
-    storage_size = H5Dget_storage_size(obj_id);
+    storage_size = H5Dget_storage_size(dset_id);
     nfilters = H5Pget_nfilters(dcpl_id);
     HDstrcpy(f_name,"\0");
 
@@ -3031,8 +3153,8 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
                 double ratio = 0;
                 int ok = 0;
 
-                hid_t tid = H5Dget_type(obj_id);
-                hid_t sid = H5Dget_space(obj_id);
+                hid_t tid = H5Dget_type(dset_id);
+                hid_t sid = H5Dget_space(dset_id);
                 size_t datum_size = H5Tget_size(tid);
                 int ndims = H5Sget_simple_extent_dims(sid, dims, NULL);
 
@@ -3090,16 +3212,15 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
             break;
         case H5D_CONTIGUOUS:
             {
-                int next;
+                int n_external;
 
-                next = H5Pget_external_count(dcpl_id);
+                n_external = H5Pget_external_count(dcpl_id);
 
-                /*-------------------------------------------------------------------------
-                 * EXTERNAL_FILE
-                 *-------------------------------------------------------------------------
-                 */
                 ctx->indent_level++;
-                if (next) {
+                if (n_external) {
+
+                    /* EXTERNAL FILE */
+
                     ctx->need_prefix = TRUE;
 
                     h5tools_str_reset(&buffer);
@@ -3113,7 +3234,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
                     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t) ncols, (hsize_t) 0, (hsize_t) 0);
 
                     ctx->indent_level++;
-                    for (j = 0; j < (unsigned) next; j++) {
+                    for (j = 0; j < (unsigned) n_external; j++) {
                         H5Pget_external(dcpl_id, j, sizeof(name), name, &offset, &size);
 
                         ctx->need_prefix = TRUE;
@@ -3134,6 +3255,8 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
                 else {
                     haddr_t ioffset;
 
+                    /* NORMAL FILE */
+
                     ctx->need_prefix = TRUE;
 
                     h5tools_str_reset(&buffer);
@@ -3149,7 +3272,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
                     ctx->need_prefix = TRUE;
 
                     h5tools_str_reset(&buffer);
-                    ioffset = H5Dget_offset(obj_id);
+                    ioffset = H5Dget_offset(dset_id);
                     h5tools_str_append(&buffer, "OFFSET "H5_PRINTF_HADDR_FMT, ioffset);
                     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t) ncols, (hsize_t) 0, (hsize_t) 0);
                 }
@@ -3160,23 +3283,23 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
         case H5D_VIRTUAL:
             {
                 char dsetname[256];     /* virtual datset name       */
-                size_t vmaps;
+                size_t n_vmaps;
 
-                H5Pget_virtual_count(dcpl_id, &vmaps);
+                H5Pget_virtual_count(dcpl_id, &n_vmaps);
 
-                if (vmaps) {
-                    size_t next;
-                    ssize_t ssize_out;
+                if (n_vmaps) {
+                    size_t curr_vmap;
+                    ssize_t H5_ATTR_NDEBUG_UNUSED ssize_out;
 
                     ctx->indent_level++;
-                    for (next = 0; next < (unsigned) vmaps; next++) {
-                        hid_t virtual_vspace = H5Pget_virtual_vspace(dcpl_id, next);
-                        hid_t virtual_srcspace = H5Pget_virtual_srcspace(dcpl_id, next);
+                    for (curr_vmap = 0; curr_vmap < n_vmaps; curr_vmap++) {
+                        hid_t virtual_vspace = H5Pget_virtual_vspace(dcpl_id, curr_vmap);
+                        hid_t virtual_srcspace = H5Pget_virtual_srcspace(dcpl_id, curr_vmap);
 
                         ctx->need_prefix = TRUE;
 
                         h5tools_str_reset(&buffer);
-                        h5tools_str_append(&buffer, "%s %ld %s ", VDS_MAPPING, next, BEGIN);
+                        h5tools_str_append(&buffer, "%s %ld %s ", VDS_MAPPING, curr_vmap, BEGIN);
                         h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t) ncols, (hsize_t) 0, (hsize_t) 0);
 
                         ctx->indent_level++;
@@ -3207,14 +3330,14 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
 
                         ctx->indent_level++;
 
-                        ssize_out = H5Pget_virtual_filename(dcpl_id, next, NULL, 0);
-                        if((size_t)ssize_out >= sizeof(name))
-                            error_msg("H5Pget_virtual_filename call returned size larger then buffer", ssize_out);
-                        H5Pget_virtual_filename(dcpl_id, next, name, sizeof(name));
-                        ssize_out = H5Pget_virtual_dsetname(dcpl_id, next, NULL, 0);
-                        if((size_t)ssize_out >= sizeof(name))
-                            error_msg("H5Pget_virtual_dsetname call returned size larger then buffer", ssize_out);
-                        H5Pget_virtual_dsetname(dcpl_id, next, dsetname, sizeof(dsetname));
+                        ssize_out = H5Pget_virtual_filename(dcpl_id, curr_vmap, NULL, 0);
+                        HDassert(ssize_out > 0);
+                        HDassert((size_t)ssize_out < sizeof(name));
+                        H5Pget_virtual_filename(dcpl_id, curr_vmap, name, sizeof(name));
+                        ssize_out = H5Pget_virtual_dsetname(dcpl_id, curr_vmap, NULL, 0);
+                        HDassert(ssize_out > 0);
+                        HDassert((size_t)ssize_out < sizeof(name));
+                        H5Pget_virtual_dsetname(dcpl_id, curr_vmap, dsetname, sizeof(dsetname));
 
                         ctx->need_prefix = TRUE;
 
@@ -3478,7 +3601,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
             break;
         case H5D_FILL_VALUE_USER_DEFINED:
             ctx->indent_level--;
-            h5tools_print_fill_value(&buffer, info, ctx, dcpl_id, type_id, obj_id);
+            h5tools_print_fill_value(&buffer, info, ctx, dcpl_id, type_id, dset_id);
             ctx->indent_level++;
             break;
         case H5D_FILL_VALUE_ERROR:
@@ -3572,8 +3695,7 @@ h5tools_dump_comment(FILE *stream, const h5tool_format_t *info, h5tools_context_
 
     cmt_bufsize = H5Oget_comment(obj_id, comment, buf_size);
 
-    /* call H5Oget_comment again with the correct value.
-     * If the call to H5Oget_comment returned an error, skip this block */
+    /* call H5Oget_comment again with the correct value */
     if (cmt_bufsize > 0) {
         comment = (char *)HDmalloc((size_t)(cmt_bufsize+1)); /* new_size including null terminator */
         if(comment) {
@@ -3588,7 +3710,7 @@ h5tools_dump_comment(FILE *stream, const h5tool_format_t *info, h5tools_context_
                 h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
 
                 h5tools_str_close(&buffer);
-            } /* end if */
+            }
             HDfree(comment);
         }
     }
@@ -3817,6 +3939,100 @@ h5tools_dump_subsetting_header(FILE *stream, const h5tool_format_t *info, h5tool
 }
 
 /*-------------------------------------------------------------------------
+ * Function:    dump_reference
+ *
+ * Purpose:     Dump reference data
+ *
+ * Return:      void
+ *-------------------------------------------------------------------------
+ */
+void
+h5tools_dump_reference(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx, hid_t container, hid_t f_type, unsigned char *region_buf, int ndims)
+{
+    hid_t               region_id = H5I_INVALID_HID;
+    hid_t               region_sid = H5I_INVALID_HID;
+    hsize_t             elmt_counter = 0;  /*counts the # elements printed. */
+    size_t              ncols = 80;        /* available output width        */
+    int                 i;
+    size_t              nsize;
+    hsize_t             curr_pos = 0;      /* total data element position   */
+    h5tools_str_t       buffer;            /* string into which to render   */
+    h5tools_context_t   datactx;           /* print context  */
+
+    H5TOOLS_START_DEBUG("");
+
+    datactx = *ctx;  /* print context  */
+    /* Assume entire data space to be printed */
+    datactx.need_prefix = TRUE;
+
+    nsize = H5Tget_size(f_type);
+
+    HDmemset(&buffer, 0, sizeof(h5tools_str_t));
+    for (i = 0; i < ndims; i++, datactx.cur_elmt++, elmt_counter++) {
+        void *memref = region_buf + i * nsize;
+
+        H5TOOLS_DEBUG("reference loop:%d with curr_pos=%ld", i, curr_pos);
+
+        datactx.need_prefix = TRUE;
+        h5tools_str_reset(&buffer);
+        H5TOOLS_DEBUG("reference loop - h5tools_str_sprint with H5T_STD_REF_DSETREG:%d", i);
+        h5tools_str_sprint(&buffer, info, container, f_type, memref, &datactx);
+        h5tools_render_element(stream, info, &datactx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)i, (hsize_t)ndims);
+
+        if (!h5tools_is_zero(memref, H5Tget_size(f_type))) {
+            if (nsize == H5R_OBJ_REF_BUF_SIZE) {
+                if ((region_id = H5Rdereference2(container, H5P_DEFAULT, H5R_OBJECT, memref)) >= 0) {
+                    datactx.indent_level++;
+                    h5tools_dump_data(stream, info, &datactx, region_id, TRUE);
+                    datactx.indent_level--;
+                }
+            }
+            else {
+                if ((region_id = H5Rdereference2(container, H5P_DEFAULT, H5R_DATASET_REGION, memref)) >= 0) {
+                    if ((region_sid = H5Rget_region(container, H5R_DATASET_REGION, memref)) >= 0) {
+                        H5S_sel_type region_type;
+
+                        region_type = H5Sget_select_type(region_sid);
+                        if(region_type == H5S_SEL_POINTS) {
+                            /* Print point information */
+                            H5TOOLS_DEBUG("H5S_SEL_POINTS H5R_DATASET_REGION");
+                            h5tools_dump_region_data_points(
+                                    region_sid, region_id, stream, info, &datactx,
+                                                &buffer, &curr_pos, ncols, (hsize_t)i, elmt_counter);
+                        }
+                        else if(region_type == H5S_SEL_HYPERSLABS) {
+                            /* Print block information */
+                            H5TOOLS_DEBUG("H5S_SEL_HYPERSLABS H5R_DATASET_REGION");
+                            h5tools_dump_region_data_blocks(
+                                    region_sid, region_id, stream, info, &datactx,
+                                                &buffer, &curr_pos, ncols, (hsize_t)i, elmt_counter);
+                        }
+                        else
+                            H5TOOLS_INFO("invalid region type");
+                        if(H5Sclose(region_sid) < 0)
+                            H5TOOLS_INFO("H5Sclose H5R_DATASET_REGION failed");
+                    } /* end if (region_space >= 0) */
+                    else
+                        H5TOOLS_INFO("H5Rget_region H5R_DATASET_REGION failed");
+                    if(H5Dclose(region_id) < 0)
+                        H5TOOLS_INFO("H5Dclose H5R_DATASET_REGION failed");
+                } /* if (region_id >= 0) */
+                else {
+                    /* if (region_id < 0) - could mean that no reference was written do not throw failure */
+                    H5Epush2(H5tools_ERR_STACK_g, __FILE__, FUNC, __LINE__, H5tools_ERR_CLS_g, H5E_tools_g, H5E_tools_min_id_g, "H5Rdereference failed");
+                }
+            }
+        } /* end else to if (h5tools_is_zero(... */
+
+        H5TOOLS_DEBUG("finished reference loop:%d",i);
+    } /* end for(i = 0; i < ndims; i++, ctx->cur_elmt++, elmt_counter++) */
+
+    h5tools_str_close(&buffer);
+
+    H5TOOLS_ENDDEBUG("");
+}
+
+/*-------------------------------------------------------------------------
  * Function:    dump_data
  *
  * Purpose:     Dump attribute, obj_data is FALSE, or dataset data, obj_data is TRUE
@@ -3829,14 +4045,10 @@ h5tools_dump_data(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
 {
     H5S_class_t        space_type;
     int                ndims;
-    size_t             i;
     size_t             nsize;
     hid_t              space = H5I_INVALID_HID;
     hid_t              f_type = H5I_INVALID_HID;
-    hid_t              region_id = H5I_INVALID_HID;
-    hid_t              region_space = H5I_INVALID_HID;
     hsize_t            total_size[H5S_MAX_RANK];
-    hsize_t            elmt_counter = 0;  /*counts the # elements printed. */
     int                status = -1;
     h5tools_context_t  datactx;            /* print context  */
     h5tools_str_t      buffer;          /* string into which to render   */
@@ -3903,13 +4115,9 @@ h5tools_dump_data(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
         H5TOOLS_DEBUG("ndims=%d - datactx.ndims=%d", ndims, datactx.ndims);
 
         /* Assume entire data space to be printed */
-        if (datactx.ndims > 0)
-            for (i = 0; i < (size_t)datactx.ndims; i++)
-                datactx.p_min_idx[i] = 0;
-
         H5Sget_simple_extent_dims(space, total_size, NULL);
-        if (datactx.ndims > 0)
-            init_acc_pos(&datactx, total_size);
+        init_acc_pos(datactx.ndims, total_size, datactx.acc, datactx.pos, datactx.p_min_idx);
+
         datactx.need_prefix = TRUE;
 
         if (NULL != (region_buf = (void *)HDcalloc(nsize, (size_t)ndims))) {
@@ -3927,64 +4135,7 @@ h5tools_dump_data(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
                     H5TOOLS_GOTO_DONE_NO_RET();
                 }
             }
-            for (i = 0; i < ndims; i++, datactx.cur_elmt++, elmt_counter++) {
-                void *memref = region_buf + i * nsize;
-
-                H5TOOLS_DEBUG("reference loop:%d with curr_pos=%ld", i, curr_pos);
-
-                datactx.need_prefix = TRUE;
-                h5tools_str_reset(&buffer);
-                H5TOOLS_DEBUG("reference loop - h5tools_str_sprint with H5T_STD_REF_DSETREG:%d", i);
-                h5tools_str_sprint(&buffer, &outputformat, obj_id, f_type, memref, &datactx);
-                h5tools_render_element(stream, &outputformat, &datactx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
-
-                if (!h5tools_is_zero(memref, H5Tget_size(f_type))) {
-                    if (nsize == H5R_OBJ_REF_BUF_SIZE) {
-                        if ((region_id = H5Rdereference2(obj_id, H5P_DEFAULT, H5R_OBJECT, memref)) >= 0) {
-                            datactx.indent_level++;
-                            h5tools_dump_data(stream, &outputformat, &datactx, region_id, TRUE);
-                            datactx.indent_level--;
-                        }
-                    }
-                    else {
-                        if ((region_id = H5Rdereference2(obj_id, H5P_DEFAULT, H5R_DATASET_REGION, memref)) >= 0) {
-                            if ((region_space = H5Rget_region(obj_id, H5R_DATASET_REGION, memref)) >= 0) {
-                                H5S_sel_type region_type;
-
-                                region_type = H5Sget_select_type(region_space);
-                                if(region_type == H5S_SEL_POINTS) {
-                                    /* Print point information */
-                                    H5TOOLS_DEBUG("H5S_SEL_POINTS H5R_DATASET_REGION");
-                                    h5tools_dump_region_data_points(
-                                                           region_space, region_id, stream, &outputformat, &datactx,
-                                                           &buffer, &curr_pos, ncols, (hsize_t)i, elmt_counter);
-                                }
-                                else if(region_type == H5S_SEL_HYPERSLABS) {
-                                    /* Print block information */
-                                    H5TOOLS_DEBUG("H5S_SEL_HYPERSLABS H5R_DATASET_REGION");
-                                    h5tools_dump_region_data_blocks(
-                                                           region_space, region_id, stream, &outputformat, &datactx,
-                                                           &buffer, &curr_pos, ncols, (hsize_t)i, elmt_counter);
-                                }
-                                else
-                                    H5TOOLS_INFO("invalid region type");
-                                if(H5Sclose(region_space) < 0)
-                                    H5TOOLS_INFO("H5Sclose H5R_DATASET_REGION failed");
-                            } /* end if (region_space >= 0) */
-                            else
-                                H5TOOLS_INFO("H5Rget_region H5R_DATASET_REGION failed");
-                            if(H5Dclose(region_id) < 0)
-                                H5TOOLS_INFO("H5Dclose H5R_DATASET_REGION failed");
-                        } /* if (region_id >= 0) */
-                        else {
-                            /* if (region_id < 0) - could mean that no reference was written do not throw failure */
-                            H5Epush2(H5tools_ERR_STACK_g, __FILE__, FUNC, __LINE__, H5tools_ERR_CLS_g, H5E_tools_g, H5E_tools_min_id_g, "H5Rdereference failed");
-                        }
-                    }
-                } /* end else to if (h5tools_is_zero(... */
-
-                H5TOOLS_DEBUG("finished reference loop:%d",i);
-            } /* end for(i = 0; i < ndims; i++, datactx->cur_elmt++, elmt_counter++) */
+            h5tools_dump_reference(stream, &outputformat, &datactx, obj_id, f_type, region_buf, ndims);
             HDfree(region_buf);
         }
         ctx->indent_level--;
diff --git a/tools/lib/h5tools_dump.h b/tools/lib/h5tools_dump.h
index f2fdb4e..67c3e5f 100644
--- a/tools/lib/h5tools_dump.h
+++ b/tools/lib/h5tools_dump.h
@@ -36,56 +36,53 @@ H5TOOLS_DLLVAR table_t *h5dump_type_table;  /*type table reference for datatype
 /* Definitions of useful routines */
 H5TOOLS_DLL void    h5tools_dump_init(void);
 
-H5TOOLS_DLL int     h5tools_dump_dset(FILE *stream, const h5tool_format_t *info,
-                            h5tools_context_t *ctx/*in,out*/, hid_t dset);
-H5TOOLS_DLL int     h5tools_dump_mem(FILE *stream, const h5tool_format_t *info,
-                            h5tools_context_t *ctx/*in,out*/, hid_t obj_id);
-H5TOOLS_DLL int     h5tools_dump_simple_data(FILE *stream, const h5tool_format_t *info, hid_t container,
-                            h5tools_context_t *ctx/*in,out*/, unsigned flags,
-                            hsize_t nelmts, hid_t type, void *_mem);
-H5TOOLS_DLL void    h5tools_dump_datatype(FILE *stream, const h5tool_format_t *info,
-                            h5tools_context_t *ctx/*in,out*/, hid_t type);
-H5TOOLS_DLL void    h5tools_dump_dataspace(FILE *stream, const h5tool_format_t *info,
-                            h5tools_context_t *ctx/*in,out*/, hid_t space);
-H5TOOLS_DLL void    h5tools_dump_attribute(FILE *stream, const h5tool_format_t *info,
-                            h5tools_context_t *ctx/*in,out*/, const char *attr_name, hid_t attr_id);
-H5TOOLS_DLL void    h5tools_dump_oid(FILE *stream, const h5tool_format_t *info,
-                            h5tools_context_t *ctx/*in,out*/, hid_t oid);
-H5TOOLS_DLL void    h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
-                            h5tools_context_t *ctx/*in,out*/, hid_t dcpl, hid_t type_id, hid_t obj_id);
-H5TOOLS_DLL void    h5tools_dump_comment(FILE *stream, const h5tool_format_t *info,
-                            h5tools_context_t *ctx/*in,out*/, hid_t obj_id);
-H5TOOLS_DLL void    h5tools_dump_data(FILE *stream, const h5tool_format_t *info,
-                            h5tools_context_t *ctx, hid_t obj_id, int obj_data);
+H5TOOLS_DLL int     h5tools_dump_dset(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx/*in,out*/,
+                            hid_t dset);
+H5TOOLS_DLL int     h5tools_dump_mem(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx/*in,out*/,
+                            hid_t obj_id);
+H5TOOLS_DLL int     h5tools_dump_simple_data(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx/*in,out*/,
+                            hid_t container, unsigned flags, hsize_t nelmts, hid_t type, void *_mem);
+H5TOOLS_DLL void    h5tools_dump_datatype(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx/*in,out*/,
+                            hid_t type);
+H5TOOLS_DLL void    h5tools_dump_dataspace(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx/*in,out*/,
+                            hid_t space);
+H5TOOLS_DLL void    h5tools_dump_attribute(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx/*in,out*/,
+                            const char *attr_name, hid_t attr_id);
+H5TOOLS_DLL void    h5tools_dump_oid(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx/*in,out*/,
+                            hid_t oid);
+H5TOOLS_DLL void    h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx/*in,out*/,
+                            hid_t dcpl, hid_t type_id, hid_t obj_id);
+H5TOOLS_DLL void    h5tools_dump_comment(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx/*in,out*/,
+                            hid_t obj_id);
+H5TOOLS_DLL void    h5tools_dump_data(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx,
+                            hid_t obj_id, int obj_data);
+H5TOOLS_DLL void    h5tools_dump_reference(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx,
+                            hid_t container, hid_t f_type, unsigned char *region_buf, int ndims);
+H5TOOLS_DLL hbool_t h5tools_dump_region_attribute(hid_t region_id,
+                            FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx/*in,out*/,
+                            h5tools_str_t *buffer, hsize_t *curr_pos, size_t ncols, hsize_t region_elmt_counter, hsize_t elmt_counter);
 
 H5TOOLS_DLL hbool_t h5tools_dump_region_data_points(hid_t region_space, hid_t region_id,
-                            FILE *stream, const h5tool_format_t *info,
-                            h5tools_context_t *ctx/*in,out*/,
-                            h5tools_str_t *buffer/*string into which to render */,
-                            hsize_t *curr_pos/*total data element position*/,
-                            size_t ncols, hsize_t region_elmt_counter/*element counter*/,
-                            hsize_t elmt_counter);
+                            FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx/*in,out*/,
+                            h5tools_str_t *buffer, hsize_t *curr_pos, size_t ncols, hsize_t region_elmt_counter, hsize_t elmt_counter);
 
 H5TOOLS_DLL hbool_t h5tools_dump_region_data_blocks(hid_t region_space, hid_t region_id,
-                            FILE *stream, const h5tool_format_t *info,
-                            h5tools_context_t *ctx/*in,out*/,
-                            h5tools_str_t *buffer/*string into which to render */,
-                            hsize_t *curr_pos/*total data element position*/,
-                            size_t ncols, hsize_t region_elmt_counter/*element counter*/,
-                            hsize_t elmt_counter);
+                            FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx/*in,out*/,
+                            h5tools_str_t *buffer, hsize_t *curr_pos, size_t ncols, hsize_t region_elmt_counter, hsize_t elmt_counter);
 
-H5TOOLS_DLL int     h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer/*in,out*/,
-                            const h5tool_format_t *info, h5tools_context_t *ctx/*in,out*/,
+H5TOOLS_DLL int     h5tools_print_datatype(FILE *stream,
+                            h5tools_str_t *buffer/*in,out*/, const h5tool_format_t *info, h5tools_context_t *ctx/*in,out*/,
                             hid_t type, int object_search);
 H5TOOLS_DLL int     h5tools_print_dataspace(h5tools_str_t *buffer/*in,out*/,
                             hid_t space);
-H5TOOLS_DLL int     h5tools_print_enum(FILE *stream, h5tools_str_t *buffer/*in,out*/,
-                            const h5tool_format_t *info, h5tools_context_t *ctx/*in,out*/,
+H5TOOLS_DLL int     h5tools_print_enum(FILE *stream,
+                            h5tools_str_t *buffer/*in,out*/, const h5tool_format_t *info, h5tools_context_t *ctx/*in,out*/,
                             hid_t type);
-H5TOOLS_DLL void    h5tools_print_fill_value(h5tools_str_t *buffer/*in,out*/,
-                            const h5tool_format_t *info, h5tools_context_t *ctx/*in,out*/,
+H5TOOLS_DLL void    h5tools_print_fill_value(
+                            h5tools_str_t *buffer/*in,out*/, const h5tool_format_t *info, h5tools_context_t *ctx/*in,out*/,
                             hid_t dcpl, hid_t type_id, hid_t obj_id);
 H5TOOLS_DLL void    h5tools_print_packed_bits(h5tools_str_t *buffer/*in,out*/, hid_t type);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/tools/lib/h5tools_error.h b/tools/lib/h5tools_error.h
index 4e2e935..764fb91 100644
--- a/tools/lib/h5tools_error.h
+++ b/tools/lib/h5tools_error.h
@@ -101,14 +101,16 @@ do {
  * H5TOOLS_PUSH_ERROR macro, used to push an error to an error stack. Not meant to
  * be called directly.
  */
-#define H5TOOLS_PUSH_ERROR(estack_id, err_cls, maj_err_id, min_err_id, ...)                          \
-do {                                                                                                 \
-    if (estack_id >= 0 && err_cls >= 0)                                                              \
-        H5Epush2(estack_id, __FILE__, FUNC, __LINE__, err_cls, maj_err_id, min_err_id, __VA_ARGS__); \
-    else {                                                                                           \
-        HDfprintf(stderr, __VA_ARGS__);                                                              \
-        HDfprintf(stderr, "\n");                                                                     \
-    }                                                                                                \
+#define H5TOOLS_PUSH_ERROR(estack_id, err_cls, maj_err_id, min_err_id, ...)                              \
+do {                                                                                                     \
+    if (enable_error_stack > 0) {                                                                        \
+        if (estack_id >= 0 && err_cls >= 0)                                                              \
+            H5Epush2(estack_id, __FILE__, FUNC, __LINE__, err_cls, maj_err_id, min_err_id, __VA_ARGS__); \
+        else {                                                                                           \
+            HDfprintf(stderr, __VA_ARGS__);                                                              \
+            HDfprintf(stderr, "\n");                                                                     \
+        }                                                                                                \
+    }                                                                                                    \
 } while(0)
 
 /*
@@ -167,30 +169,30 @@ do {
 
 #ifdef H5_TOOLS_DEBUG
 
-#define H5TOOLS_START_DEBUG(...)                                                                 \
-do {                                                                                             \
-    H5tools_INDENT_g += 2;                                                                       \
+#define H5TOOLS_START_DEBUG(...)                                                                     \
+do {                                                                                                 \
+    H5tools_INDENT_g += 2;                                                                           \
     HDfprintf(stderr, "%*sENTER %s:%d in %s()...", H5tools_INDENT_g, "", __FILE__, __LINE__, FUNC);  \
-    HDfprintf(stderr, __VA_ARGS__);                                                              \
-    HDfprintf(stderr, "\n");                                                                     \
-    HDfflush(stderr);                                                                            \
+    HDfprintf(stderr, __VA_ARGS__);                                                                  \
+    HDfprintf(stderr, "\n");                                                                         \
+    HDfflush(stderr);                                                                                \
 } while(0)
 
-#define H5TOOLS_DEBUG(...)                                                                       \
-do {                                                                                             \
+#define H5TOOLS_DEBUG(...)                                                                           \
+do {                                                                                                 \
     HDfprintf(stderr, "%*s %s:%d in %s()...", H5tools_INDENT_g, "", __FILE__, __LINE__, FUNC);       \
-    HDfprintf(stderr, __VA_ARGS__);                                                              \
-    HDfprintf(stderr, "\n");                                                                     \
-    HDfflush(stderr);                                                                            \
+    HDfprintf(stderr, __VA_ARGS__);                                                                  \
+    HDfprintf(stderr, "\n");                                                                         \
+    HDfflush(stderr);                                                                                \
 } while(0)
 
-#define H5TOOLS_ENDDEBUG(...)                                                                    \
-do {                                                                                             \
+#define H5TOOLS_ENDDEBUG(...)                                                                        \
+do {                                                                                                 \
     HDfprintf(stderr, "%*sEXIT %s:%d in %s()...", H5tools_INDENT_g, "", __FILE__, __LINE__, FUNC);   \
-    HDfprintf(stderr, __VA_ARGS__);                                                              \
-    HDfprintf(stderr, "\n");                                                                     \
-    H5tools_INDENT_g -= 2;                                                                       \
-    HDfflush(stderr);                                                                            \
+    HDfprintf(stderr, __VA_ARGS__);                                                                  \
+    HDfprintf(stderr, "\n");                                                                         \
+    H5tools_INDENT_g -= 2;                                                                           \
+    HDfflush(stderr);                                                                                \
 } while(0)
 
 #else
diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c
index 798c025..3843ee4 100644
--- a/tools/lib/h5tools_str.c
+++ b/tools/lib/h5tools_str.c
@@ -278,16 +278,12 @@ h5tools_str_fmt(h5tools_str_t *str/*in,out*/, size_t start, const char *fmt)
  * Purpose: Renders the line prefix value into string STR.
  *
  * Return:  Success:    Pointer to the prefix.
- *
  *          Failure:    NULL
- *
- * Programmer:  Robb Matzke
- *              Thursday, July 23, 1998
  *-------------------------------------------------------------------------
  */
 char *
-h5tools_str_prefix(h5tools_str_t *str/*in,out*/, const h5tool_format_t *info,
-    hsize_t elmtno, unsigned ndims, h5tools_context_t *ctx)
+h5tools_str_prefix(h5tools_str_t *str/*in,out*/, const h5tool_format_t *info, hsize_t elmtno,
+        h5tools_context_t *ctx)
 {
     size_t    i = 0;
     hsize_t   curr_pos = elmtno;
@@ -297,28 +293,16 @@ h5tools_str_prefix(h5tools_str_t *str/*in,out*/, const h5tool_format_t *info,
     H5TOOLS_DEBUG("elmtno=%ld, ctx->ndims=%d", elmtno, ctx->ndims);
     h5tools_str_reset(str);
 
-    H5TOOLS_DEBUG("ndims=%d", ndims);
-    if(ndims > 0) {
-        /*
-         * Calculate the number of elements represented by a unit change in a
-         * certain index position.
-         */
-        for(i = 0; i < (size_t) ndims; i++) {
-            H5TOOLS_DEBUG("curr_pos=%ld - ctx->acc[%d]=%ld", curr_pos, i, ctx->acc[i]);
-            ctx->pos[i] = curr_pos / ctx->acc[i];
-            curr_pos -= ctx->acc[i] * ctx->pos[i];
-            H5TOOLS_DEBUG("curr_pos=%ld - ctx->pos[%d]=%ld - ctx->acc[%d]=%ld", curr_pos, i, ctx->pos[i], i, ctx->acc[i]);
-        }
+    curr_pos = calc_acc_pos(ctx->ndims, elmtno, ctx->acc, ctx->pos);
+    if(ctx->ndims > 0) {
         HDassert(curr_pos == 0);
 
         /* Print the index values */
-        for(i = 0; i < (size_t) ndims; i++) {
+        for(i = 0; i < (size_t) ctx->ndims; i++) {
             if (i)
                 h5tools_str_append(str, "%s", OPT(info->idx_sep, ","));
 
-            h5tools_str_append(str, OPT(info->idx_n_fmt, HSIZE_T_FORMAT),
-                    (hsize_t) ctx->pos[i]);
-
+            h5tools_str_append(str, OPT(info->idx_n_fmt, HSIZE_T_FORMAT), (hsize_t) ctx->pos[i]);
         }
     }
     else        /* Scalar */
@@ -338,52 +322,38 @@ h5tools_str_prefix(h5tools_str_t *str/*in,out*/, const h5tool_format_t *info,
  *
  * Return:  Success:    Pointer to the prefix.
  *          Failure:    NULL
- *
- * In/Out:
- *      h5tools_context_t *ctx
- *      h5tools_str_t     *str
  *-------------------------------------------------------------------------
  */
 char *
-h5tools_str_region_prefix(h5tools_str_t *str, const h5tool_format_t *info,
-        hsize_t elmtno, hsize_t *ptdata, unsigned ndims, hsize_t max_idx[],
-        h5tools_context_t *ctx)
+h5tools_str_region_prefix(h5tools_str_t *str/*in,out*/, const h5tool_format_t *info, hsize_t elmtno,
+        hsize_t *ptdata, h5tools_context_t *ctx)
 {
     size_t    i = 0;
     hsize_t   curr_pos = elmtno;
-    hsize_t   p_prod[H5S_MAX_RANK];
 
-    h5tools_str_reset(str);
+    H5TOOLS_START_DEBUG("");
 
-    if(ndims > 0) {
-        /*
-         * Calculate the number of elements represented by a unit change in a
-         * certain index position.
-         */
-        for(i = ndims - 1, p_prod[ndims - 1] = 1; i > 0; --i)
-            p_prod[i - 1] = (max_idx[i]) * p_prod[i];
+    H5TOOLS_DEBUG("elmtno=%ld, ctx->ndims=%d", elmtno, ctx->ndims);
+    h5tools_str_reset(str);
 
-        for(i = 0; i < (size_t) ndims; i++) {
-            if(curr_pos > 0) {
-                ctx->pos[i] = curr_pos / p_prod[i];
-                curr_pos -= p_prod[i] * ctx->pos[i];
-            }
-            else
-                ctx->pos[i] = 0;
-            ctx->pos[i] += (unsigned long) ptdata[ctx->sm_pos+i];
-        }
+    curr_pos = calc_acc_pos(ctx->ndims, elmtno, ctx->acc, ctx->pos);
+    if(ctx->ndims > 0) {
+        HDassert(curr_pos == 0);
 
         /* Print the index values */
-        for(i = 0; i < (size_t) ndims; i++) {
-            if(i)
+        for(i = 0; i < (size_t) ctx->ndims; i++) {
+            ctx->pos[i] += (unsigned long) ptdata[ctx->sm_pos+i];
+            if (i)
                 h5tools_str_append(str, "%s", OPT(info->idx_sep, ","));
 
             h5tools_str_append(str, OPT(info->idx_n_fmt, HSIZE_T_FORMAT), (hsize_t) ctx->pos[i]);
-
         }
-    } /* if (ndims > 0) */
+    }
     else        /* Scalar */
-        h5tools_str_append(str, OPT(info->idx_n_fmt, HSIZE_T_FORMAT), (hsize_t) 0);
+        h5tools_str_append(str, OPT(info->idx_n_fmt, HSIZE_T_FORMAT), (hsize_t)0);
+    H5TOOLS_DEBUG("str=%s", str->s);
+
+    H5TOOLS_ENDDEBUG("");
 
     /* Add prefix and suffix to the index */
     return h5tools_str_fmt(str, (size_t)0, OPT(info->idx_fmt, "%s: "));
@@ -1276,7 +1246,6 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
                 break;
         } /* end switch */
     }
-    H5TOOLS_DEBUG("switch done");
 
     ret_value = h5tools_str_fmt(str, start, OPT(info->elmt_fmt, "%s"));
 
diff --git a/tools/lib/h5tools_str.h b/tools/lib/h5tools_str.h
index 3f922bb..d27aa95 100644
--- a/tools/lib/h5tools_str.h
+++ b/tools/lib/h5tools_str.h
@@ -31,13 +31,12 @@ H5TOOLS_DLL char    *h5tools_str_reset(h5tools_str_t *str);
 H5TOOLS_DLL char    *h5tools_str_trunc(h5tools_str_t *str, size_t size);
 H5TOOLS_DLL char    *h5tools_str_fmt(h5tools_str_t *str, size_t start, const char *fmt);
 H5TOOLS_DLL char    *h5tools_str_prefix(h5tools_str_t *str, const h5tool_format_t *info,
-                        hsize_t elmtno, unsigned ndims, h5tools_context_t *ctx);
+                        hsize_t elmtno, h5tools_context_t *ctx);
 /*
  * new functions needed to display region reference data
  */
 H5TOOLS_DLL char    *h5tools_str_region_prefix(h5tools_str_t *str, const h5tool_format_t *info,
-                                   hsize_t elmtno, hsize_t *ptdata, unsigned ndims,
-                                   hsize_t max_idx[], h5tools_context_t *ctx);
+                                   hsize_t elmtno, hsize_t *ptdata, h5tools_context_t *ctx);
 H5TOOLS_DLL void     h5tools_str_dump_space_slabs(h5tools_str_t *, hid_t, const h5tool_format_t *, h5tools_context_t *ctx);
 H5TOOLS_DLL void     h5tools_str_dump_space_blocks(h5tools_str_t *, hid_t, const h5tool_format_t *);
 H5TOOLS_DLL void     h5tools_str_dump_space_points(h5tools_str_t *, hid_t, const h5tool_format_t *);
diff --git a/tools/lib/h5tools_utils.c b/tools/lib/h5tools_utils.c
index 8de7f80..27c5ad1 100644
--- a/tools/lib/h5tools_utils.c
+++ b/tools/lib/h5tools_utils.c
@@ -1048,7 +1048,7 @@ h5tools_getenv_update_hyperslab_bufsize(void)
 {
     const char *env_str = NULL;
     long hyperslab_bufsize_mb;
-    int ret_value = 1;
+    int  ret_value = 1;
 
     /* check if environment variable is set for the hyperslab buffer size */
     if (NULL != (env_str = HDgetenv ("H5TOOLS_BUFSIZE"))) {
@@ -1067,6 +1067,55 @@ done:
     return ret_value;
 }
 
+#ifdef H5_HAVE_ROS3_VFD
+/*----------------------------------------------------------------------------
+ *
+ * Function: h5tools_parse_ros3_fapl_tuple
+ *
+ * Purpose:  A convenience function that parses a string containing a tuple
+ *           of S3 VFD credential information and then passes the result to
+ *           `h5tools_populate_ros3_fapl()` in order to setup a valid
+ *           configuration for the S3 VFD.
+ *
+ * Return:   SUCCEED/FAIL
+ *
+ *----------------------------------------------------------------------------
+ */
+herr_t
+h5tools_parse_ros3_fapl_tuple(const char *tuple_str, int delim,
+    H5FD_ros3_fapl_t *fapl_config_out)
+{
+    const char  *ccred[3];
+    unsigned     nelems     = 0;
+    char        *start      = NULL;
+    char        *s3cred_src = NULL;
+    char       **s3cred     = NULL;
+    herr_t       ret_value  = SUCCEED;
+
+    /* Attempt to parse S3 credentials tuple */
+    if (parse_tuple(tuple_str, delim, &s3cred_src, &nelems, &s3cred) < 0)
+        H5TOOLS_GOTO_ERROR(FAIL, "failed to parse S3 VFD info tuple");
+
+    /* Sanity-check tuple count */
+    if (nelems != 3)
+        H5TOOLS_GOTO_ERROR(FAIL, "invalid S3 VFD credentials");
+
+    ccred[0] = (const char *)s3cred[0];
+    ccred[1] = (const char *)s3cred[1];
+    ccred[2] = (const char *)s3cred[2];
+
+    if (0 == h5tools_populate_ros3_fapl(fapl_config_out, ccred))
+        H5TOOLS_GOTO_ERROR(FAIL, "failed to populate S3 VFD FAPL config");
+
+done:
+    if (s3cred)
+        HDfree(s3cred);
+    if (s3cred_src)
+        HDfree(s3cred_src);
+
+    return ret_value;
+}
+
 
 /*----------------------------------------------------------------------------
  *
@@ -1130,7 +1179,6 @@ done:
  *
  *----------------------------------------------------------------------------
  */
-#ifdef H5_HAVE_ROS3_VFD
 int
 h5tools_populate_ros3_fapl(H5FD_ros3_fapl_t  *fa,
                            const char       **values)
@@ -1254,73 +1302,72 @@ h5tools_populate_ros3_fapl(H5FD_ros3_fapl_t  *fa,
 
 done:
     return ret_value;
-
 } /* h5tools_populate_ros3_fapl */
 #endif /* H5_HAVE_ROS3_VFD */
 
-
-/*-----------------------------------------------------------------------------
- *
- * Function: h5tools_set_configured_fapl
- *
- * Purpose: prepare fapl_id with the given property list, according to
- *          VFD prototype.
+#ifdef H5_HAVE_LIBHDFS
+/*----------------------------------------------------------------------------
  *
- * Return: 0 on failure, 1 on success
+ * Function: h5tools_parse_hdfs_fapl_tuple
  *
- * Programmer: Jacob Smith
- *             2018-05-21
+ * Purpose:  A convenience function that parses a string containing a tuple
+ *           of HDFS VFD configuration information.
  *
- * Changes: None.
+ * Return:   SUCCEED/FAIL
  *
- *-----------------------------------------------------------------------------
+ *----------------------------------------------------------------------------
  */
-int
-h5tools_set_configured_fapl(hid_t      fapl_id,
-                           const char  vfd_name[],
-                           void       *fapl_t_ptr)
+herr_t
+h5tools_parse_hdfs_fapl_tuple(const char *tuple_str, int delim,
+    H5FD_hdfs_fapl_t *fapl_config_out)
 {
-    int ret_value = 1;
-
-    if (fapl_id < 0) {
-        return 0;
+    unsigned long   k         = 0;
+    unsigned        nelems    = 0;
+    char           *props_src = NULL;
+    char          **props     = NULL;
+    herr_t          ret_value = SUCCEED;
+
+    /* Attempt to parse HDFS configuration tuple */
+    if (parse_tuple(tuple_str, delim, &props_src, &nelems, &props) < 0)
+        H5TOOLS_GOTO_ERROR(FAIL, "failed to parse HDFS VFD configuration tuple");
+
+    /* Sanity-check tuple count */
+    if (nelems != 5)
+        H5TOOLS_GOTO_ERROR(FAIL, "invalid HDFS VFD configuration");
+
+    /* Populate fapl configuration structure with given properties.
+     * WARNING: No error-checking is done on length of input strings...
+     *          Silent overflow is possible, albeit unlikely.
+     */
+    if (HDstrncmp(props[0], "", 1)) {
+        HDstrncpy(fapl_config_out->namenode_name, (const char *)props[0], HDstrlen(props[0]));
     }
-
-    if (!strcmp("", vfd_name)) {
-        goto done;
-
-#ifdef H5_HAVE_ROS3_VFD
-    } else if (!strcmp("ros3", vfd_name)) {
-        if ((fapl_id == H5P_DEFAULT) ||
-            (fapl_t_ptr == NULL) ||
-            (FAIL == H5Pset_fapl_ros3(
-                fapl_id,
-                (H5FD_ros3_fapl_t *)fapl_t_ptr)))
-        {
-            ret_value = 0;
-            goto done;
-        }
-#endif /* H5_HAVE_ROS3_VFD */
-
-#ifdef H5_HAVE_LIBHDFS
-    } else if (!strcmp("hdfs", vfd_name)) {
-        if ((fapl_id == H5P_DEFAULT) ||
-            (fapl_t_ptr == NULL) ||
-            (FAIL == H5Pset_fapl_hdfs(
-                fapl_id,
-                (H5FD_hdfs_fapl_t *)fapl_t_ptr)))
-        {
-            ret_value = 0;
-            goto done;
-        }
-#endif /* H5_HAVE_LIBHDFS */
-
-    } else {
-        ret_value = 0; /* unrecognized fapl type "name" */
+    if (HDstrncmp(props[1], "", 1)) {
+        k = strtoul((const char *)props[1], NULL, 0);
+        if (errno == ERANGE)
+            H5TOOLS_GOTO_ERROR(FAIL, "supposed port number wasn't");
+        fapl_config_out->namenode_port = (int32_t)k;
+    }
+    if (HDstrncmp(props[2], "", 1)) {
+        HDstrncpy(fapl_config_out->kerberos_ticket_cache, (const char *)props[2], HDstrlen(props[2]));
+    }
+    if (HDstrncmp(props[3], "", 1)) {
+        HDstrncpy(fapl_config_out->user_name, (const char *)props[3], HDstrlen(props[3]));
+    }
+    if (HDstrncmp(props[4], "", 1)) {
+        k = HDstrtoul((const char *)props[4], NULL, 0);
+        if (errno == ERANGE)
+            H5TOOLS_GOTO_ERROR(FAIL, "supposed buffersize number wasn't");
+        fapl_config_out->stream_buffer_size = (int32_t)k;
     }
 
 done:
-    return ret_value;
+    if (props)
+        HDfree(props);
+    if (props_src)
+        HDfree(props_src);
 
-} /* h5tools_set_configured_fapl() */
+    return ret_value;
+}
+#endif /* H5_HAVE_LIBHDFS */
 
diff --git a/tools/lib/h5tools_utils.h b/tools/lib/h5tools_utils.h
index 812854f..5daa5d2 100644
--- a/tools/lib/h5tools_utils.h
+++ b/tools/lib/h5tools_utils.h
@@ -172,10 +172,15 @@ H5TOOLS_DLL void h5tools_setprogname(const char*progname);
 H5TOOLS_DLL int h5tools_getstatus(void);
 H5TOOLS_DLL void h5tools_setstatus(int d_status);
 H5TOOLS_DLL int h5tools_getenv_update_hyperslab_bufsize(void);
-H5TOOLS_DLL int h5tools_set_configured_fapl(hid_t fapl_id, const char vfd_name[], void *fapl_t_ptr);
 #ifdef H5_HAVE_ROS3_VFD
+H5TOOLS_DLL herr_t h5tools_parse_ros3_fapl_tuple(const char *tuple_str, int delim,
+    H5FD_ros3_fapl_t *fapl_config_out);
 H5TOOLS_DLL int h5tools_populate_ros3_fapl(H5FD_ros3_fapl_t *fa, const char **values);
 #endif /* H5_HAVE_ROS3_VFD */
+#ifdef H5_HAVE_LIBHDFS
+H5TOOLS_DLL herr_t h5tools_parse_hdfs_fapl_tuple(const char *tuple_str, int delim,
+    H5FD_hdfs_fapl_t *fapl_config_out);
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/tools/lib/io_timer.c b/tools/lib/io_timer.c
index 472824b..5c0c31d 100644
--- a/tools/lib/io_timer.c
+++ b/tools/lib/io_timer.c
@@ -23,7 +23,6 @@
  */
 
 #include "H5private.h"
-#include "hdf5.h"
 
 #include "io_timer.h"
 
diff --git a/tools/libtest/h5tools_test_utils.c b/tools/libtest/h5tools_test_utils.c
index 726f4c4..210fae6 100644
--- a/tools/libtest/h5tools_test_utils.c
+++ b/tools/libtest/h5tools_test_utils.c
@@ -16,6 +16,7 @@
  * Jacob Smith 2017-11-10
  */
 
+#include "h5tools.h"
 #include "h5tools_utils.h"
 #include "h5test.h"
 
@@ -960,7 +961,7 @@ error :
  *
  * Function:   test_set_configured_fapl()
  *
- * Purpose:    Verify `h5tools_set_configured_fapl()` with ROS3 VFD
+ * Purpose:    Verify `h5tools_get_fapl()` with ROS3 and HDFS VFDs
  *
  * Return:     0 if test passes
  *             1 if failure
@@ -1147,7 +1148,8 @@ test_set_configured_fapl(void)
     TESTING("programmatic fapl set");
 
     for (i = 0; i < n_cases; i++) {
-        int      result;
+        h5tools_vfd_info_t vfd_info;
+        hid_t result;
         testcase C = cases[i];
 
         fapl_id = H5I_INVALID_HID;
@@ -1169,11 +1171,13 @@ test_set_configured_fapl(void)
 #endif /* UTIL_TEST_DEBUG */
 
         /* test */
-        result = h5tools_set_configured_fapl(
-                fapl_id,
-                C.vfdname,
-                C.conf_fa);
-        JSVERIFY( result, C.expected, C.message )
+        vfd_info.info = C.conf_fa;
+        vfd_info.name = C.vfdname;
+        result = h5tools_get_fapl(H5P_DEFAULT, &vfd_info);
+        if (C.expected == 0)
+            JSVERIFY( result, H5I_INVALID_HID, C.message)
+        else
+            JSVERIFY_NOT( result, H5I_INVALID_HID, C.message)
 
 #if UTIL_TEST_DEBUG
         HDfprintf(stderr, "after test\n"); fflush(stderr);
diff --git a/tools/src/h5copy/h5copy.c b/tools/src/h5copy/h5copy.c
index e1370e2..5b19ae7 100644
--- a/tools/src/h5copy/h5copy.c
+++ b/tools/src/h5copy/h5copy.c
@@ -207,10 +207,6 @@ static int parse_flag(const char* s_flag, unsigned *flag)
 int
 main (int argc, const char *argv[])
 {
-    H5E_auto2_t         func;
-    H5E_auto2_t         tools_func;
-    void               *edata;
-    void               *tools_edata;
     hid_t        fid_src = H5I_INVALID_HID;
     hid_t        fid_dst = H5I_INVALID_HID;
     unsigned     flag = 0;
@@ -226,17 +222,9 @@ main (int argc, const char *argv[])
     h5tools_setprogname(PROGRAMNAME);
     h5tools_setstatus(EXIT_SUCCESS);
 
-    /* Disable error reporting */
-    H5Eget_auto2(H5E_DEFAULT, &func, &edata);
-    H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
-
     /* Initialize h5tools lib */
     h5tools_init();
 
-    /* Disable tools error reporting */
-    H5Eget_auto2(H5tools_ERR_STACK_g, &tools_func, &tools_edata);
-    H5Eset_auto2(H5tools_ERR_STACK_g, NULL, NULL);
-
     /* init linkinfo struct */
     HDmemset(&linkinfo, 0, sizeof(h5tool_link_info_t));
 
@@ -330,10 +318,8 @@ main (int argc, const char *argv[])
         leave(EXIT_FAILURE);
     }
 
-    if (enable_error_stack > 0) {
-        H5Eset_auto2(H5E_DEFAULT, func, edata);
-        H5Eset_auto2(H5tools_ERR_STACK_g, tools_func, tools_edata);
-    }
+    /* enable error reporting if command line option */
+    h5tools_error_report();
 
    /*-------------------------------------------------------------------------
     * open output file
@@ -342,13 +328,13 @@ main (int argc, const char *argv[])
     /* Attempt to open an existing HDF5 file first. Need to open the dst file
        before the src file just in case that the dst and src are the same file
      */
-    fid_dst = h5tools_fopen(fname_dst, H5F_ACC_RDWR, H5P_DEFAULT, NULL, NULL, 0);
+    fid_dst = h5tools_fopen(fname_dst, H5F_ACC_RDWR, H5P_DEFAULT, FALSE, NULL, 0);
 
    /*-------------------------------------------------------------------------
     * open input file
     *-------------------------------------------------------------------------*/
 
-    fid_src = h5tools_fopen(fname_src, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, 0);
+    fid_src = h5tools_fopen(fname_src, H5F_ACC_RDONLY, H5P_DEFAULT, FALSE, NULL, 0);
 
    /*-------------------------------------------------------------------------
     * test for error in opening input file
diff --git a/tools/src/h5diff/h5diff_common.c b/tools/src/h5diff/h5diff_common.c
index e05a8e3..327be71 100644
--- a/tools/src/h5diff/h5diff_common.c
+++ b/tools/src/h5diff/h5diff_common.c
@@ -25,22 +25,23 @@ static int check_d_input(const char*);
  * Command-line options: The user can specify short or long-named
  * parameters.
  */
-static const char *s_opts = "hVrv:qn:d:p:NcelxE:S";
+static const char *s_opts = "hVrv:qn:d:p:NcelxE:A:S";
 static struct long_options l_opts[] = {
-    { "help", no_arg, 'h' },
-    { "version", no_arg, 'V' },
-    { "report", no_arg, 'r' },
-    { "verbose", optional_arg, 'v' },
-    { "quiet", no_arg, 'q' },
-    { "count", require_arg, 'n' },
-    { "delta", require_arg, 'd' },
-    { "relative", require_arg, 'p' },
-    { "nan", no_arg, 'N' },
-    { "compare", no_arg, 'c' },
+    { "help",               no_arg, 'h' },
+    { "version",            no_arg, 'V' },
+    { "report",             no_arg, 'r' },
+    { "verbose",            optional_arg, 'v' },
+    { "quiet",              no_arg, 'q' },
+    { "count",              require_arg, 'n' },
+    { "delta",              require_arg, 'd' },
+    { "relative",           require_arg, 'p' },
+    { "nan",                no_arg, 'N' },
+    { "compare",            no_arg, 'c' },
     { "use-system-epsilon", no_arg, 'e' },
-    { "follow-symlinks", no_arg, 'l' },
-    { "no-dangling-links", no_arg, 'x' },
-    { "exclude-path", require_arg, 'E' },
+    { "follow-symlinks",    no_arg, 'l' },
+    { "no-dangling-links",  no_arg, 'x' },
+    { "exclude-path",       require_arg, 'E' },
+    { "exclude-attribute",  require_arg, 'A' },
     { "enable-error-stack", no_arg, 'S' },
     { NULL, 0, '\0' }
 };
@@ -49,7 +50,6 @@ static struct long_options l_opts[] = {
  * Function: check_options
  *
  * Purpose: parse command line input
- *
  *-------------------------------------------------------------------------
  */
 static void check_options(diff_opt_t* opts)
@@ -61,7 +61,7 @@ static void check_options(diff_opt_t* opts)
     /* check between -d , -p, --use-system-epsilon.
      * These options are mutually exclusive.
      */
-    if ((opts->d + opts->p + opts->use_system_epsilon) > 1) {
+    if ((opts->delta_bool + opts->percent_bool + opts->use_system_epsilon) > 1) {
         HDprintf("%s error: -d, -p and --use-system-epsilon options are mutually-exclusive;\n", PROGRAMNAME);
         HDprintf("use no more than one.\n");
         HDprintf("Try '-h' or '--help' option for more information or see the %s entry in the 'HDF5 Reference Manual'.\n", PROGRAMNAME);
@@ -69,29 +69,140 @@ static void check_options(diff_opt_t* opts)
     }
 }
 
+/*-------------------------------------------------------------------------
+ * Function:    parse_hsize_list
+ *
+ * Purpose:     Parse a list of comma or space separated integers and return
+ *              them in a list. The string being passed into this function
+ *              should be at the start of the list you want to parse. You are
+ *              responsible for freeing the array returned from here.
+ *
+ *              Lists in the so-called "terse" syntax are separated by
+ *              semicolons (;). The lists themselves can be separated by
+ *              either commas (,) or white spaces.
+ *
+ * Return:      <none>
+ *-------------------------------------------------------------------------
+ */
+static void
+parse_hsize_list(const char *h_list, subset_d *d)
+{
+    hsize_t        *p_list;
+    const char     *ptr;
+    unsigned int    size_count = 0;
+    unsigned int    i = 0;
+    unsigned int    last_digit = 0;
+
+    if (!h_list || !*h_list || *h_list == ';')
+        return;
+
+    H5TOOLS_START_DEBUG(" - h_list:%s", h_list);
+    /* count how many integers do we have */
+    for (ptr = h_list; ptr && *ptr && *ptr != ';' && *ptr != ']'; ptr++)
+        if (HDisdigit(*ptr)) {
+            if (!last_digit)
+                /* the last read character wasn't a digit */
+                size_count++;
+
+            last_digit = 1;
+        }
+        else
+            last_digit = 0;
+
+    if (size_count == 0) {
+        /* there aren't any integers to read */
+        H5TOOLS_ENDDEBUG("No integers to read");
+        return;
+    }
+    H5TOOLS_DEBUG("Number integers to read=%ld", size_count);
+
+    /* allocate an array for the integers in the list */
+    if((p_list = (hsize_t *)HDcalloc(size_count, sizeof(hsize_t))) == NULL)
+        H5TOOLS_INFO("Unable to allocate space for subset data");
+
+    for (ptr = h_list; i < size_count && ptr && *ptr && *ptr != ';' && *ptr != ']'; ptr++)
+        if(HDisdigit(*ptr)) {
+            /* we should have an integer now */
+            p_list[i++] = (hsize_t)HDstrtoull(ptr, NULL, 0);
+
+            while (HDisdigit(*ptr))
+                /* scroll to end of integer */
+                ptr++;
+        }
+    d->data = p_list;
+    d->len = size_count;
+    H5TOOLS_ENDDEBUG("");
+}
+
+/*-------------------------------------------------------------------------
+ * Function:    parse_subset_params
+ *
+ * Purpose:     Parse the so-called "terse" syntax for specifying subsetting parameters.
+ *
+ * Return:      Success:    struct subset_t object
+ *              Failure:    NULL
+ *-------------------------------------------------------------------------
+ */
+static struct subset_t *
+parse_subset_params(const char *dset)
+{
+    struct subset_t *s = NULL;
+    char   *brace;
+
+    H5TOOLS_START_DEBUG(" - dset:%s", dset);
+    if ((brace = HDstrrchr(dset, '[')) != NULL) {
+        *brace++ = '\0';
+
+        s = (struct subset_t *)HDcalloc(1, sizeof(struct subset_t));
+        parse_hsize_list(brace, &s->start);
+
+        while (*brace && *brace != ';')
+            brace++;
+
+        if (*brace)
+            brace++;
+
+        parse_hsize_list(brace, &s->stride);
+
+        while (*brace && *brace != ';')
+            brace++;
+
+        if (*brace)
+            brace++;
+
+        parse_hsize_list(brace, &s->count);
+
+        while (*brace && *brace != ';')
+            brace++;
+
+        if (*brace)
+            brace++;
+
+        parse_hsize_list(brace, &s->block);
+    }
+    H5TOOLS_ENDDEBUG("");
+
+    return s;
+}
+
 
 /*-------------------------------------------------------------------------
  * Function: parse_command_line
  *
  * Purpose: parse command line input
- *
  *-------------------------------------------------------------------------
  */
 
-void parse_command_line(int argc,
-                        const char* argv[],
-                        const char** fname1,
-                        const char** fname2,
-                        const char** objname1,
-                        const char** objname2,
-                        diff_opt_t* opts)
+void parse_command_line(int argc, const char* argv[], const char** fname1, const char** fname2, const char** objname1, const char** objname2, diff_opt_t* opts)
 {
     int i;
     int opt;
     struct exclude_path_list *exclude_head, *exclude_prev, *exclude_node;
+    struct exclude_path_list *exclude_attr_head, *exclude_attr_prev, *exclude_attr_node;
 
+    H5TOOLS_START_DEBUG("");
     /* process the command-line */
-    memset(opts, 0, sizeof (diff_opt_t));
+    HDmemset(opts, 0, sizeof (diff_opt_t));
 
     /* assume equal contents initially */
     opts->contents = 1;
@@ -100,15 +211,18 @@ void parse_command_line(int argc,
     opts->do_nans = 1;
 
     /* not Listing objects that are not comparable */
-    opts->m_list_not_cmp = 0;
+    opts->mode_list_not_cmp = 0;
 
     /* initially no not-comparable. */
     /**this is bad in mixing option with results**/
-    opts->not_cmp=0;
+    opts->not_cmp = 0;
 
     /* init for exclude-path option */
     exclude_head = NULL;
 
+    /* init for exclude-attribute option */
+    exclude_attr_head = NULL;
+
     /* parse command line options */
     while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF) {
         switch ((char)opt) {
@@ -128,7 +242,7 @@ void parse_command_line(int argc,
             break;
 
         case 'v':
-            opts->m_verbose = 1;
+            opts->mode_verbose = 1;
             /* This for loop is for handling style like
              * -v, -v1, --verbose, --verbose=1.
              */
@@ -138,11 +252,11 @@ void parse_command_line(int argc,
                  */
                 if (!strcmp (argv[i], "-v")) {  /* no arg */
                     opt_ind--;
-                    opts->m_verbose_level = 0;
+                    opts->mode_verbose_level = 0;
                     break;
                 }
                 else if (!strncmp (argv[i], "-v", (size_t)2)) {
-                    opts->m_verbose_level = atoi(&argv[i][2]);
+                    opts->mode_verbose_level = atoi(&argv[i][2]);
                     break;
                 }
 
@@ -150,11 +264,11 @@ void parse_command_line(int argc,
                  * long opt
                  */
                 if (!strcmp (argv[i], "--verbose")) {  /* no arg */
-                    opts->m_verbose_level = 0;
+                    opts->mode_verbose_level = 0;
                     break;
                 }
-                else if ( !strncmp (argv[i], "--verbose", (size_t)9) && argv[i][9]=='=') {
-                    opts->m_verbose_level = atoi(&argv[i][10]);
+                else if (!strncmp (argv[i], "--verbose", (size_t)9) && argv[i][9]=='=') {
+                    opts->mode_verbose_level = atoi(&argv[i][10]);
                     break;
                 }
             }
@@ -162,11 +276,11 @@ void parse_command_line(int argc,
 
         case 'q':
             /* use quiet mode; supress the message "0 differences found" */
-            opts->m_quiet = 1;
+            opts->mode_quiet = 1;
             break;
 
         case 'r':
-            opts->m_report = 1;
+            opts->mode_report = 1;
             break;
 
         case 'l':
@@ -191,7 +305,7 @@ void parse_command_line(int argc,
             }
 
             /* init */
-            exclude_node->obj_path = (char*)opt_arg;
+            exclude_node->obj_path = opt_arg;
             exclude_node->obj_type = H5TRAV_TYPE_UNKNOWN;
             exclude_prev = exclude_head;
 
@@ -201,45 +315,69 @@ void parse_command_line(int argc,
             }
             else {
                 while(NULL != exclude_prev->next)
-                    exclude_prev=exclude_prev->next;
+                    exclude_prev = exclude_prev->next;
 
                 exclude_node->next = NULL;
                 exclude_prev->next = exclude_node;
             }
             break;
 
+        case 'A':
+            opts->exclude_attr_path = 1;
+
+            /* create linked list of excluding objects */
+            if( (exclude_attr_node = (struct exclude_path_list*) HDmalloc(sizeof(struct exclude_path_list))) == NULL) {
+                HDprintf("Error: lack of memory!\n");
+                h5diff_exit(EXIT_FAILURE);
+            }
+
+            /* init */
+            exclude_attr_node->obj_path = opt_arg;
+            exclude_attr_node->obj_type = H5TRAV_TYPE_UNKNOWN;
+            exclude_attr_prev = exclude_attr_head;
+
+            if (NULL == exclude_attr_head) {
+                exclude_attr_head = exclude_attr_node;
+                exclude_attr_head->next = NULL;
+            }
+            else {
+                while(NULL != exclude_attr_prev->next)
+                    exclude_attr_prev = exclude_attr_prev->next;
+
+                exclude_attr_node->next = NULL;
+                exclude_attr_prev->next = exclude_attr_node;
+            }
+            break;
+
         case 'd':
-            opts->d=1;
+            opts->delta_bool = 1;
 
-            if (check_d_input(opt_arg) == - 1) {
+            if (check_d_input(opt_arg) == -1) {
                 HDprintf("<-d %s> is not a valid option\n", opt_arg);
                 usage();
                 h5diff_exit(EXIT_FAILURE);
             }
-            opts->delta = atof(opt_arg);
-
-            /* -d 0 is the same as default */
-            if (H5_DBL_ABS_EQUAL(opts->delta, (double)0.0F))
-                opts->d=0;
+            opts->delta = HDatof(opt_arg);
+            /* do not check against default, the DBL_EPSILON is being replaced by user */
             break;
 
         case 'p':
-            opts->p=1;
+            opts->percent_bool = 1;
             if (check_p_input(opt_arg) == -1) {
                 HDprintf("<-p %s> is not a valid option\n", opt_arg);
                 usage();
                 h5diff_exit(EXIT_FAILURE);
             }
-            opts->percent = atof(opt_arg);
+            opts->percent = HDatof(opt_arg);
 
             /* -p 0 is the same as default */
             if (H5_DBL_ABS_EQUAL(opts->percent, (double)0.0F))
-                opts->p = 0;
+                opts->percent_bool = 0;
             break;
 
         case 'n':
-            opts->n=1;
-            if ( check_n_input(opt_arg) == -1) {
+            opts->count_bool = 1;
+            if (check_n_input(opt_arg) == -1) {
                 HDprintf("<-n %s> is not a valid option\n", opt_arg);
                 usage();
                 h5diff_exit(EXIT_FAILURE);
@@ -252,7 +390,7 @@ void parse_command_line(int argc,
             break;
 
         case 'c':
-            opts->m_list_not_cmp = 1;
+            opts->mode_list_not_cmp = 1;
             break;
 
         case 'e':
@@ -268,30 +406,46 @@ void parse_command_line(int argc,
     if (opts->exclude_path)
         opts->exclude = exclude_head;
 
+    /* if exclude-attribute option is used, keep the exclude attr list */
+    if (opts->exclude_attr_path)
+        opts->exclude_attr = exclude_attr_head;
+
     /* check for file names to be processed */
-    if (argc <= opt_ind || argv[ opt_ind + 1 ] == NULL) {
+    if (argc <= opt_ind || argv[opt_ind + 1] == NULL) {
         error_msg("missing file names\n");
         usage();
         h5diff_exit(EXIT_FAILURE);
     }
 
-    *fname1 = argv[ opt_ind ];
-    *fname2 = argv[ opt_ind + 1 ];
-    *objname1 = argv[ opt_ind + 2 ];
+    *fname1 = argv[opt_ind];
+    *fname2 = argv[opt_ind + 1];
+    *objname1 = argv[opt_ind + 2];
+    H5TOOLS_DEBUG("file1 = %s", *fname1);
+    H5TOOLS_DEBUG("file2 = %s", *fname2);
 
     if (*objname1 == NULL) {
         *objname2 = NULL;
+        H5TOOLS_ENDDEBUG("No obj names");
         return;
     }
+    H5TOOLS_DEBUG("objname1 = %s", *objname1);
 
-    if (argv[ opt_ind + 3 ] != NULL) {
-        *objname2 = argv[ opt_ind + 3 ];
+    if (argv[opt_ind + 3] != NULL) {
+        *objname2 = argv[opt_ind + 3];
     }
     else {
         *objname2 = *objname1;
     }
+    H5TOOLS_DEBUG("objname2 = %s", *objname2);
 
+    /*
+     * TRILABS-227 is complete except for an issue with printing indices
+     * the following calls will enable subsetting
+    opts->sset[0] = parse_subset_params(*objname1);
 
+    opts->sset[1] = parse_subset_params(*objname2);
+    */
+    H5TOOLS_ENDDEBUG("");
 }
 
 
@@ -299,26 +453,25 @@ void parse_command_line(int argc,
  * Function: print_info
  *
  * Purpose: print several information messages after h5diff call
- *
  *-------------------------------------------------------------------------
  */
 void print_info(diff_opt_t* opts)
 {
-    if (opts->m_quiet || opts->err_stat)
+    if (opts->mode_quiet || opts->err_stat)
         return;
 
     if (opts->cmn_objs == 0) {
         HDprintf("No common objects found. Files are not comparable.\n");
-        if (!opts->m_verbose)
+        if (!opts->mode_verbose)
             HDprintf("Use -v for a list of objects.\n");
     }
 
     if (opts->not_cmp == 1) {
-        if (opts->m_list_not_cmp == 0) {
+        if (opts->mode_list_not_cmp == 0) {
             HDprintf("--------------------------------\n");
             HDprintf("Some objects are not comparable\n");
             HDprintf("--------------------------------\n");
-            if (opts->m_verbose)
+            if (opts->mode_verbose)
                 HDprintf("Use -c for a list of objects without details of differences.\n");
             else
                 HDprintf("Use -c for a list of objects.\n");
@@ -332,19 +485,10 @@ void print_info(diff_opt_t* opts)
  * Purpose: check for valid input
  *
  * Return: 1 for ok, -1 for fail
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: May 9, 2003
- *
- * Comments:
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 H5_ATTR_PURE static int
-check_n_input( const char *str )
+check_n_input(const char *str)
 {
     unsigned i;
     char c;
@@ -368,28 +512,21 @@ check_n_input( const char *str )
  * Purpose: check for a valid p option input
  *
  * Return: 1 for ok, -1 for fail
- *
- * Date: May 9, 2003
- *
- * Comments:
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
-check_p_input( const char *str )
+check_p_input(const char *str)
 {
     double x;
 
     /*
-    the atof return value on a hexadecimal input is different
-    on some systems; we do a character check for this
-    */
+     * the atof return value on a hexadecimal input is different
+     * on some systems; we do a character check for this
+     */
     if (HDstrlen(str) > 2 && str[0] == '0' && str[1] == 'x')
         return -1;
 
-    x = atof(str);
+    x = HDatof(str);
     if (x < 0)
         return -1;
 
@@ -402,28 +539,21 @@ check_p_input( const char *str )
  * Purpose: check for a valid d option input
  *
  * Return: 1 for ok, -1 for fail
- *
- * Date: November 11, 2007
- *
- * Comments:
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
-check_d_input( const char *str )
+check_d_input(const char *str)
 {
     double x;
 
     /*
-    the atof return value on a hexadecimal input is different
-    on some systems; we do a character check for this
-    */
+     * the atof return value on a hexadecimal input is different
+     * on some systems; we do a character check for this
+     */
     if (HDstrlen(str) > 2 && str[0] == '0' && str[1] == 'x')
         return -1;
 
-    x = atof(str);
+    x = HDatof(str);
     if (x < 0)
         return -1;
 
@@ -436,7 +566,6 @@ check_d_input( const char *str )
  * Purpose: print a usage message
  *
  * Return: void
- *
  *-------------------------------------------------------------------------
  */
 
@@ -461,10 +590,9 @@ void usage(void)
  PRINTVALSTREAM(rawoutstream, "         Verbose mode with level. Print differences and list of objects.\n");
  PRINTVALSTREAM(rawoutstream, "         Level of detail depends on value of N:\n");
  PRINTVALSTREAM(rawoutstream, "          0 : Identical to '-v' or '--verbose'.\n");
- PRINTVALSTREAM(rawoutstream, "          1 : All level 0 information plus one-line attribute\n");
- PRINTVALSTREAM(rawoutstream, "              status summary.\n");
- PRINTVALSTREAM(rawoutstream, "          2 : All level 1 information plus extended attribute\n");
- PRINTVALSTREAM(rawoutstream, "              status report.\n");
+ PRINTVALSTREAM(rawoutstream, "          1 : All level 0 information plus one-line attribute status summary.\n");
+ PRINTVALSTREAM(rawoutstream, "          2 : All level 1 information plus extended attribute status report.\n");
+ PRINTVALSTREAM(rawoutstream, "          3 : All level 2 information plus file names.\n");
  PRINTVALSTREAM(rawoutstream, "   -q, --quiet\n");
  PRINTVALSTREAM(rawoutstream, "         Quiet mode. Do not produce output.\n");
  PRINTVALSTREAM(rawoutstream, "   --enable-error-stack\n");
@@ -541,7 +669,14 @@ void usage(void)
  PRINTVALSTREAM(rawoutstream, "         excluded.\n");
  PRINTVALSTREAM(rawoutstream, "         This option can be used repeatedly to exclude multiple paths.\n");
  PRINTVALSTREAM(rawoutstream, "\n");
-
+ PRINTVALSTREAM(rawoutstream, "   --exclude-attribute \"path/to/object/with/attribute\"\n");
+ PRINTVALSTREAM(rawoutstream, "         Exclude attributes on the specified path to an object when comparing files or groups.\n");
+ PRINTVALSTREAM(rawoutstream, "\n");
+ PRINTVALSTREAM(rawoutstream, "         If there are multiple paths to an object, only the specified path(s)\n");
+ PRINTVALSTREAM(rawoutstream, "         will be excluded; the comparison will include any path not explicitly\n");
+ PRINTVALSTREAM(rawoutstream, "         excluded.\n");
+ PRINTVALSTREAM(rawoutstream, "         This option can be used repeatedly to exclude multiple paths.\n");
+ PRINTVALSTREAM(rawoutstream, "\n");
  PRINTVALSTREAM(rawoutstream, " Modes of output:\n");
  PRINTVALSTREAM(rawoutstream, "  Default mode: print the number of differences found and where they occured\n");
  PRINTVALSTREAM(rawoutstream, "  -r Report mode: print the above plus the differences\n");
@@ -572,7 +707,22 @@ void usage(void)
  PRINTVALSTREAM(rawoutstream, "      (The option --follow-symlinks overrides the default behavior when\n");
  PRINTVALSTREAM(rawoutstream, "       symbolic links are compared.).\n");
  PRINTVALSTREAM(rawoutstream, "\n");
-
+ /*
+  * TRILABS-227 is complete except for an issue with printing indices
+  * the following will be needed for subsetting
+ PRINTVALSTREAM(rawoutstream, " Subsetting options:\n");
+ PRINTVALSTREAM(rawoutstream, "  Subsetting is available by using the fcompact form of subsetting, as follows:\n");
+ PRINTVALSTREAM(rawoutstream, "    obj1 /foo/mydataset[START;STRIDE;COUNT;BLOCK]\n");
+ PRINTVALSTREAM(rawoutstream, "  It is not required to use all parameters, but until the last parameter value used,\n");
+ PRINTVALSTREAM(rawoutstream, "  all of the semicolons (;) are required, even when a parameter value is not specified. Example:\n");
+ PRINTVALSTREAM(rawoutstream, "    obj1 /foo/mydataset[START;;COUNT;BLOCK]\n");
+ PRINTVALSTREAM(rawoutstream, "    obj1 /foo/mydataset[START]\n");
+ PRINTVALSTREAM(rawoutstream, "  The STRIDE, COUNT, and BLOCK parameters are optional and will default to 1 in\n");
+ PRINTVALSTREAM(rawoutstream, "  each dimension. START is optional and will default to 0 in each dimension.\n");
+ PRINTVALSTREAM(rawoutstream, "  Each of START, STRIDE, COUNT, and BLOCK must be a comma-separated list of integers with\n");
+ PRINTVALSTREAM(rawoutstream, "  one integer for each dimension of the dataset.\n");
+ PRINTVALSTREAM(rawoutstream, "\n");
+*/
  PRINTVALSTREAM(rawoutstream, " Exit code:\n");
  PRINTVALSTREAM(rawoutstream, "  0 if no differences, 1 if differences found, 2 if error\n");
  PRINTVALSTREAM(rawoutstream, "\n");
diff --git a/tools/src/h5diff/h5diff_main.c b/tools/src/h5diff/h5diff_main.c
index c5a0cbf..33d6570 100644
--- a/tools/src/h5diff/h5diff_main.c
+++ b/tools/src/h5diff/h5diff_main.c
@@ -69,10 +69,7 @@
 int main(int argc, const char *argv[])
 {
     int        ret;
-    H5E_auto2_t         func;
-    H5E_auto2_t         tools_func;
-    void               *edata;
-    void               *tools_edata;
+    int        i;
     const char *fname1 = NULL;
     const char *fname2 = NULL;
     const char *objname1  = NULL;
@@ -83,27 +80,17 @@ int main(int argc, const char *argv[])
     h5tools_setprogname(PROGRAMNAME);
     h5tools_setstatus(EXIT_SUCCESS);
 
-    /* Disable error reporting */
-    H5Eget_auto2(H5E_DEFAULT, &func, &edata);
-    H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
-
     /* Initialize h5tools lib */
     h5tools_init();
 
-    /* Disable tools error reporting */
-    H5Eget_auto2(H5tools_ERR_STACK_g, &tools_func, &tools_edata);
-    H5Eset_auto2(H5tools_ERR_STACK_g, NULL, NULL);
-
     /*-------------------------------------------------------------------------
     * process the command-line
     *-------------------------------------------------------------------------
     */
     parse_command_line(argc, argv, &fname1, &fname2, &objname1, &objname2, &opts);
 
-    if (enable_error_stack > 0) {
-        H5Eset_auto2(H5E_DEFAULT, func, edata);
-        H5Eset_auto2(H5tools_ERR_STACK_g, tools_func, tools_edata);
-    }
+    /* enable error reporting if command line option */
+    h5tools_error_report();
 
     /*-------------------------------------------------------------------------
     * do the diff
@@ -130,6 +117,23 @@ int main(int argc, const char *argv[])
     if (opts.err_stat)
         ret = 2;
 
+    /* free any buffers */
+    for (i = 0; i < 2; i++) {
+        if (opts.sset[i]) {
+            if(opts.sset[i]->start.data)
+                HDfree(opts.sset[i]->start.data);
+            if(opts.sset[i]->stride.data)
+                HDfree(opts.sset[i]->stride.data);
+            if(opts.sset[i]->count.data)
+                HDfree(opts.sset[i]->count.data);
+            if(opts.sset[i]->block.data)
+                HDfree(opts.sset[i]->block.data);
+
+            HDfree(opts.sset[i]);
+            opts.sset[i]=NULL;
+        }
+    }
+
     h5diff_exit(ret);
 }
 
diff --git a/tools/src/h5dump/CMakeLists.txt b/tools/src/h5dump/CMakeLists.txt
index e02fe68..cae7212 100644
--- a/tools/src/h5dump/CMakeLists.txt
+++ b/tools/src/h5dump/CMakeLists.txt
@@ -12,9 +12,9 @@ if (NOT ONLY_SHARED_LIBS)
   )
   target_include_directories (h5dump PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
   target_compile_options(h5dump PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+  #target_compile_definitions(h5dump PRIVATE H5_TOOLS_DEBUG)
   TARGET_C_PROPERTIES (h5dump STATIC)
   target_link_libraries (h5dump PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
-  #target_compile_definitions(h5dump PRIVATE H5_TOOLS_DEBUG)
   set_target_properties (h5dump PROPERTIES FOLDER tools)
   set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5dump")
 
@@ -29,9 +29,9 @@ if (BUILD_SHARED_LIBS)
   )
   target_include_directories (h5dump-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
   target_compile_options(h5dump-shared PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+  #target_compile_definitions(h5dump-shared PRIVATE H5_TOOLS_DEBUG)
   TARGET_C_PROPERTIES (h5dump-shared SHARED)
   target_link_libraries (h5dump-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
-  #target_compile_definitions(h5dump-shared PRIVATE H5_TOOLS_DEBUG)
   set_target_properties (h5dump-shared PROPERTIES FOLDER tools)
   set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5dump-shared")
 
diff --git a/tools/src/h5dump/h5dump.c b/tools/src/h5dump/h5dump.c
index 731fcd7..f30d8fd 100644
--- a/tools/src/h5dump/h5dump.c
+++ b/tools/src/h5dump/h5dump.c
@@ -18,30 +18,32 @@
 /* Name of tool */
 #define PROGRAMNAME "h5dump"
 
-static const char   *driver = NULL;      /* The driver to open the file with. */
-const char          *outfname=NULL;
-static int           doxml = 0;
-static int           useschema = 1;
-static const char   *xml_dtd_uri = NULL;
+static const char   *driver_name_g = NULL;  /* The driver to open the file with. */
+const char          *outfname_g = NULL;
+static hbool_t      doxml_g = FALSE;
+static hbool_t      useschema_g = TRUE;
+static const char   *xml_dtd_uri_g = NULL;
 
 #ifdef H5_HAVE_ROS3_VFD
-static H5FD_ros3_fapl_t ros3_fa = {
-    1,     /* version           */
-    false, /* authenticate      */
-    "",    /* aws region        */
-    "",    /* access key id     */
-    "",    /* secret access key */
+/* Default "anonymous" S3 configuration */
+static H5FD_ros3_fapl_t ros3_fa_g = {
+    1,     /* Structure Version */
+    false, /* Authenticate?     */
+    "",    /* AWS Region        */
+    "",    /* Access Key ID     */
+    "",    /* Secret Access Key */
 };
 #endif /* H5_HAVE_ROS3_VFD */
 
 #ifdef H5_HAVE_LIBHDFS
-static H5FD_hdfs_fapl_t hdfs_fa = {
-    1,           /* fapl version          */
-    "localhost", /* namenode name         */
-    0,           /* namenode port         */
-    "",          /* kerberos ticket cache */
-    "",          /* user name             */
-    2048,        /* stream buffer size    */
+/* "Default" HDFS configuration */
+static H5FD_hdfs_fapl_t hdfs_fa_g = {
+    1,           /* Structure Version     */
+    "localhost", /* Namenode Name         */
+    0,           /* Namenode Port         */
+    "",          /* Kerberos ticket cache */
+    "",          /* User name             */
+    2048,        /* Stream buffer size    */
 };
 #endif /* H5_HAVE_LIBHDFS */
 
@@ -641,12 +643,12 @@ parse_hsize_list(const char *h_list, subset_d *d)
  *-------------------------------------------------------------------------
  */
 static struct subset_t *
-parse_subset_params(char *dset)
+parse_subset_params(const char *dset)
 {
     struct subset_t *s = NULL;
     char   *brace;
 
-    if (!disable_compact_subset && ((brace = HDstrrchr(dset, '[')) != NULL)) {
+    if (!dump_opts.disable_compact_subset && ((brace = HDstrrchr(dset, '[')) != NULL)) {
         *brace++ = '\0';
 
         s = (struct subset_t *)HDcalloc(1, sizeof(struct subset_t));
@@ -861,14 +863,14 @@ parse_command_line(int argc, const char *argv[])
     int                 opt;
     int                 last_was_dset = FALSE;
 
-     /* no arguments */
+    /* no arguments */
     if (argc == 1) {
         usage(h5tools_getprogname());
         goto error;
     }
 
     /* this will be plenty big enough to hold the info */
-    if((hand = (struct handler_t *)HDcalloc((size_t)argc, sizeof(struct handler_t)))==NULL) {
+    if((hand = (struct handler_t *)HDcalloc((size_t)argc, sizeof(struct handler_t))) == NULL) {
         goto error;
     }
 
@@ -877,50 +879,50 @@ parse_command_line(int argc, const char *argv[])
 parse_start:
         switch ((char)opt) {
         case 'R':
-            display_region = TRUE;
+            dump_opts.display_region = TRUE;
             region_output = TRUE;
             break;
         case 'B':
-            display_bb = TRUE;
+            dump_opts.display_bb = TRUE;
             last_was_dset = FALSE;
             break;
         case 'n':
-            display_fi = TRUE;
+            dump_opts.display_fi = TRUE;
             last_was_dset = FALSE;
             if (opt_arg != NULL)
                 h5trav_set_verbose(HDatoi(opt_arg));
             break;
         case 'p':
-            display_dcpl = TRUE;
+            dump_opts.display_dcpl = TRUE;
             break;
         case 'y':
-            display_ai = FALSE;
+            dump_opts.display_ai = FALSE;
             break;
         case 'e':
-            display_escape = TRUE;
+            dump_opts.display_escape = TRUE;
             break;
         case 'H':
-            display_data = FALSE;
-            display_attr_data = FALSE;
+            dump_opts.display_data = FALSE;
+            dump_opts.display_attr_data = FALSE;
             last_was_dset = FALSE;
             break;
         case 'A':
             if (opt_arg != NULL) {
                 if(0 == HDatoi(opt_arg))
-                    include_attrs = FALSE;
+                    dump_opts.include_attrs = FALSE;
             }
             else {
-                display_data = FALSE;
-                display_attr_data = TRUE;
+                dump_opts.display_data = FALSE;
+                dump_opts.display_attr_data = TRUE;
                 last_was_dset = FALSE;
             }
             break;
         case 'i':
-            display_oid = TRUE;
+            dump_opts.display_oid = TRUE;
             last_was_dset = FALSE;
             break;
         case 'r':
-            display_char = TRUE;
+            dump_opts.display_char = TRUE;
             break;
         case 'V':
             print_version(h5tools_getprogname());
@@ -941,7 +943,7 @@ parse_start:
             }
             break;
         case 'N':
-            display_all = 0;
+            dump_opts.display_all = 0;
 
             for (i = 0; i < argc; i++)
                 if (!hand[i].func) {
@@ -953,7 +955,7 @@ parse_start:
             last_was_dset = FALSE;
             break;
         case 'a':
-            display_all = 0;
+            dump_opts.display_all = 0;
 
             for (i = 0; i < argc; i++)
                 if (!hand[i].func) {
@@ -965,7 +967,7 @@ parse_start:
             last_was_dset = FALSE;
             break;
         case 'd':
-            display_all = 0;
+            dump_opts.display_all = 0;
 
             for (i = 0; i < argc; i++)
                 if (!hand[i].func) {
@@ -979,10 +981,10 @@ parse_start:
             last_was_dset = TRUE;
             break;
         case 'f':
-            driver = opt_arg;
+            driver_name_g = opt_arg;
             break;
         case 'g':
-            display_all = 0;
+            dump_opts.display_all = 0;
 
             for (i = 0; i < argc; i++)
                 if (!hand[i].func) {
@@ -994,7 +996,7 @@ parse_start:
             last_was_dset = FALSE;
             break;
         case 'l':
-            display_all = 0;
+            dump_opts.display_all = 0;
 
             for (i = 0; i < argc; i++)
                 if (!hand[i].func) {
@@ -1006,7 +1008,7 @@ parse_start:
             last_was_dset = FALSE;
             break;
         case 't':
-            display_all = 0;
+            dump_opts.display_all = 0;
 
             for (i = 0; i < argc; i++)
                 if (!hand[i].func) {
@@ -1033,13 +1035,13 @@ parse_start:
                 }
             }
             else {
-                if(display_attr_data && !display_data) {
+                if(dump_opts.display_attr_data && !dump_opts.display_data) {
                     if (h5tools_set_attr_output_file(opt_arg, 0) < 0) {
                         usage(h5tools_getprogname());
                         goto error;
                     }
                 }
-                if(display_data || display_all) {
+                if(dump_opts.display_data || dump_opts.display_all) {
                     if (h5tools_set_data_output_file(opt_arg, 0) < 0) {
                         usage(h5tools_getprogname());
                         goto error;
@@ -1047,9 +1049,9 @@ parse_start:
                 }
             }
 
-            usingdasho = TRUE;
+            dump_opts.usingdasho = TRUE;
             last_was_dset = FALSE;
-            outfname = opt_arg;
+            outfname_g = opt_arg;
             break;
 
         case 'b':
@@ -1061,8 +1063,8 @@ parse_start:
                 }
             }
             bin_output = TRUE;
-            if (outfname!=NULL) {
-                if (h5tools_set_data_output_file(outfname, 1) < 0)  {
+            if (outfname_g != NULL) {
+                if (h5tools_set_data_output_file(outfname_g, 1) < 0)  {
                     /* failed to set output file */
                     usage(h5tools_getprogname());
                     goto error;
@@ -1097,14 +1099,14 @@ parse_start:
                 usage(h5tools_getprogname());
                 goto error;
             }
-            display_packed_bits = TRUE;
+            dump_opts.display_packed_bits = TRUE;
             break;
         case 'v':
-            display_vds_first = TRUE;
+            dump_opts.display_vds_first = TRUE;
             break;
         case 'G':
-            vds_gap_size = HDatoi(opt_arg);
-            if (vds_gap_size < 0) {
+            dump_opts.vds_gap_size = HDatoi(opt_arg);
+            if (dump_opts.vds_gap_size < 0) {
                 usage(h5tools_getprogname());
                 goto error;
             }
@@ -1113,15 +1115,15 @@ parse_start:
         /** begin XML parameters **/
         case 'x':
             /* select XML output */
-            doxml = TRUE;
-            useschema = TRUE;
+            doxml_g = TRUE;
+            useschema_g = TRUE;
             h5tools_dump_header_format = NULL;
             dump_function_table = &xml_function_table;
             h5tools_nCols = 0;
             break;
         case 'u':
-            doxml = TRUE;
-            useschema = FALSE;
+            doxml_g = TRUE;
+            useschema_g = FALSE;
             xmlnsprefix = "";
             h5tools_dump_header_format = NULL;
             dump_function_table = &xml_function_table;
@@ -1130,7 +1132,7 @@ parse_start:
         case 'D':
             /* specify alternative XML DTD or schema */
             /* To Do: check format of this value?  */
-            xml_dtd_uri = opt_arg;
+            xml_dtd_uri_g = opt_arg;
             h5tools_nCols = 0;
             break;
 
@@ -1143,7 +1145,7 @@ parse_start:
         case 'X':
             /* specify XML namespace (default="hdf5:"), or none */
             /* To Do: check format of this value?  */
-            if (!useschema) {
+            if (!useschema_g) {
                 usage(h5tools_getprogname());
                 goto error;
             }
@@ -1241,7 +1243,7 @@ end_collect:
                 enable_error_stack = 1;
             break;
         case 'C':
-            disable_compact_subset = TRUE;
+            dump_opts.disable_compact_subset = TRUE;
             break;
         case 'h':
             usage(h5tools_getprogname());
@@ -1251,106 +1253,37 @@ end_collect:
             goto done;
 
         case '$':
-#ifndef H5_HAVE_ROS3_VFD
+#ifdef H5_HAVE_ROS3_VFD
+            if (h5tools_parse_ros3_fapl_tuple(opt_arg, ',', &ros3_fa_g) < 0) {
+                error_msg("failed to parse S3 VFD credential info\n");
+                usage(h5tools_getprogname());
+                free_handler(hand, argc);
+                hand = NULL;
+                h5tools_setstatus(EXIT_FAILURE);
+                goto done;
+            }
+#else
             error_msg("Read-Only S3 VFD not enabled.\n");
             h5tools_setstatus(EXIT_FAILURE);
             goto done;
-#else
-            /* s3 credential */
-            {
-                char       **s3_cred = NULL;
-                char        *s3_cred_string = NULL;
-                const char  *ccred[3];
-                unsigned     nelems = 0;
-                if (FAIL == parse_tuple(opt_arg, ',', &s3_cred_string, &nelems, &s3_cred)) {
-                    error_msg("unable to parse malformed s3 credentials\n");
-                    usage(h5tools_getprogname());
-                    free_handler(hand, argc);
-                    hand = NULL;
-                    h5tools_setstatus(EXIT_FAILURE);
-                    goto done;
-                }
-                if (nelems != 3) {
-                    error_msg("s3 credentials expects 3 elements\n");
-                    usage(h5tools_getprogname());
-                    free_handler(hand, argc);
-                    hand = NULL;
-                    h5tools_setstatus(EXIT_FAILURE);
-                    goto done;
-                }
-                ccred[0] = (const char *)s3_cred[0];
-                ccred[1] = (const char *)s3_cred[1];
-                ccred[2] = (const char *)s3_cred[2];
-                if (0 == h5tools_populate_ros3_fapl(&ros3_fa, ccred)) {
-                    error_msg("Invalid S3 credentials\n");
-                    usage(h5tools_getprogname());
-                    free_handler(hand, argc);
-                    hand = NULL;
-                    h5tools_setstatus(EXIT_FAILURE);
-                    goto done;
-                }
-                HDfree(s3_cred);
-                HDfree(s3_cred_string);
-            } /* s3 credential block */
+#endif
             break;
-#endif /* H5_HAVE_ROS3_VFD */
 
         case '#':
-#ifndef H5_HAVE_LIBHDFS
-            error_msg("HDFS VFD is not enabled.\n");
-            goto error;
-#else
-            {
-                /* read hdfs properties tuple and store values in `hdfs_fa` */
-                unsigned         nelems    = 0;
-                char            *props_src = NULL;
-                char           **props     = NULL;
-                unsigned long    k         = 0;
-                if (FAIL == parse_tuple((const char *)opt_arg, ',', &props_src, &nelems, &props)) {
-                    error_msg("unable to parse hdfs properties tuple\n");
-                    goto error;
-                }
-                /* sanity-check tuple count
-                 */
-                if (nelems != 5) {
-                    h5tools_setstatus(EXIT_FAILURE);
-                    goto error;
-                }
-                /* Populate fapl configuration structure with given
-                 * properties.
-                 * WARNING: No error-checking is done on length of input
-                 *          strings... Silent overflow is possible, albeit
-                 *          unlikely.
-                 */
-                if (strncmp(props[0], "", 1))
-                    HDstrncpy(hdfs_fa.namenode_name, (const char *)props[0], HDstrlen(props[0]));
-
-                if (strncmp(props[1], "", 1)) {
-                    k = strtoul((const char *)props[1], NULL, 0);
-                    if (errno == ERANGE) {
-                        h5tools_setstatus(EXIT_FAILURE);
-                        goto error;
-                    }
-                    hdfs_fa.namenode_port = (int32_t)k;
-                }
-                if (strncmp(props[2], "", 1))
-                    HDstrncpy(hdfs_fa.kerberos_ticket_cache, (const char *)props[2], HDstrlen(props[2]));
-
-                if (strncmp(props[3], "", 1))
-                    HDstrncpy(hdfs_fa.user_name, (const char *)props[3], HDstrlen(props[3]));
-
-                if (strncmp(props[4], "", 1)) {
-                    k = strtoul((const char *)props[4], NULL, 0);
-                    if (errno == ERANGE) {
-                        h5tools_setstatus(EXIT_FAILURE);
-                        goto error;
-                    }
-                    hdfs_fa.stream_buffer_size = (int32_t)k;
-                }
-                HDfree(props);
-                HDfree(props_src);
+#ifdef H5_HAVE_LIBHDFS
+            if (h5tools_parse_hdfs_fapl_tuple(opt_arg, ',', &hdfs_fa_g) < 0) {
+                error_msg("failed to parse HDFS VFD configuration info\n");
+                usage(h5tools_getprogname());
+                free_handler(hand, argc);
+                hand = NULL;
+                h5tools_setstatus(EXIT_FAILURE);
+                goto done;
             }
-#endif /* H5_HAVE_LIBHDFS */
+#else
+            error_msg("HDFS VFD not enabled.\n");
+            h5tools_setstatus(EXIT_FAILURE);
+            goto done;
+#endif
             break;
 
         case '?':
@@ -1396,14 +1329,10 @@ main(int argc, const char *argv[])
     hid_t               fid = H5I_INVALID_HID;
     hid_t               gid = H5I_INVALID_HID;
     hid_t               fapl_id = H5P_DEFAULT;
-    H5E_auto2_t         func;
-    H5E_auto2_t         tools_func;
     H5O_info_t          oi;
     struct handler_t   *hand = NULL;
     int                 i;
     unsigned            u;
-    void               *edata;
-    void               *tools_edata;
     char               *fname = NULL;
 
     h5tools_setprogname(PROGRAMNAME);
@@ -1412,63 +1341,50 @@ main(int argc, const char *argv[])
     dump_function_table = &ddl_function_table;
     dump_indent = 0;
 
-    /* Disable error reporting */
-    H5Eget_auto2(H5E_DEFAULT, &func, &edata);
-    H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
-
     /* Initialize h5tools lib */
     h5tools_init();
 
-    /* Disable tools error reporting */
-    H5Eget_auto2(H5tools_ERR_STACK_g, &tools_func, &tools_edata);
-    H5Eset_auto2(H5tools_ERR_STACK_g, NULL, NULL);
-
     if((hand = parse_command_line(argc, argv))==NULL) {
         goto done;
     }
 
-    if (bin_output && outfname == NULL) {
+    if (bin_output && outfname_g == NULL) {
         error_msg("binary output requires a file name, use -o <filename>\n");
         h5tools_setstatus(EXIT_FAILURE);
         goto done;
     }
 
-    if (enable_error_stack > 0) {
-        H5Eset_auto2(H5E_DEFAULT, func, edata);
-        H5Eset_auto2(H5tools_ERR_STACK_g, tools_func, tools_edata);
-    }
-
     /* Check for conflicting options */
-    if (doxml) {
-        if (!display_all) {
+    if (doxml_g) {
+        if (!dump_opts.display_all) {
             error_msg("option \"%s\" not available for XML\n", "to display selected objects");
             h5tools_setstatus(EXIT_FAILURE);
             goto done;
         }
-        else if (display_bb) {
+        else if (dump_opts.display_bb) {
             error_msg("option \"%s\" not available for XML\n", "--boot-block");
             h5tools_setstatus(EXIT_FAILURE);
             goto done;
         }
-        else if (display_oid == 1) {
+        else if (dump_opts.display_oid == 1) {
             error_msg("option \"%s\" not available for XML\n", "--object-ids");
             h5tools_setstatus(EXIT_FAILURE);
             goto done;
         }
-        else if (display_char == TRUE) {
+        else if (dump_opts.display_char == TRUE) {
             error_msg("option \"%s\" not available for XML\n", "--string");
             h5tools_setstatus(EXIT_FAILURE);
             goto done;
         }
-        else if (usingdasho) {
+        else if (dump_opts.usingdasho) {
             error_msg("option \"%s\" not available for XML\n", "--output");
             h5tools_setstatus(EXIT_FAILURE);
             goto done;
         }
     }
     else {
-        if (xml_dtd_uri) {
-            warn_msg("option \"%s\" only applies with XML: %s\n", "--xml-dtd", xml_dtd_uri);
+        if (xml_dtd_uri_g) {
+            warn_msg("option \"%s\" only applies with XML: %s\n", "--xml-dtd", xml_dtd_uri_g);
         }
     }
 
@@ -1478,57 +1394,50 @@ main(int argc, const char *argv[])
         h5tools_setstatus(EXIT_FAILURE);
         goto done;
     }
+
+    /* enable error reporting if command line option */
+    h5tools_error_report();
+
     /* Initialize indexing options */
     h5trav_set_index(sort_by, sort_order);
 
-    if (driver != NULL) {
-        void *conf_fa = NULL;
+    if (driver_name_g != NULL) {
+        h5tools_vfd_info_t vfd_info;
+
+        vfd_info.info       = NULL;
+        vfd_info.name       = driver_name_g;
 
-        if (!strcmp(driver, "ros3")) {
-#ifndef H5_HAVE_ROS3_VFD
+        if (!HDstrcmp(driver_name_g, drivernames[ROS3_VFD_IDX])) {
+#ifdef H5_HAVE_ROS3_VFD
+            vfd_info.info = (void *)&ros3_fa_g;
+#else
             error_msg("Read-Only S3 VFD not enabled.\n");
             h5tools_setstatus(EXIT_FAILURE);
             goto done;
-#else
-            conf_fa = (void *)&ros3_fa;
-#endif /* H5_HAVE_ROS3_VFD */
+#endif
         }
-        else if (!HDstrcmp(driver, "hdfs")) {
-#ifndef H5_HAVE_LIBHDFS
-            error_msg("HDFS VFD is not enabled.\n");
+        else if (!HDstrcmp(driver_name_g, drivernames[HDFS_VFD_IDX])) {
+#ifdef H5_HAVE_LIBHDFS
+            vfd_info.info = (void *)&hdfs_fa_g;
+#else
+            error_msg("The HDFS VFD is not enabled.\n");
             h5tools_setstatus(EXIT_FAILURE);
             goto done;
-#else
-            conf_fa = (void *)&hdfs_fa;
-#endif /* H5_HAVE_LIBHDFS */
+#endif
         }
 
-        if (conf_fa != NULL) {
-            fapl_id = H5Pcreate(H5P_FILE_ACCESS);
-            if (fapl_id < 0) {
-                error_msg("unable to create fapl entry\n");
-                h5tools_setstatus(EXIT_FAILURE);
-                goto done;
-            }
-            /* driver guaranteed "ros3" or "hdfs" */
-            /* conf_fa appropriate to driver */
-            if (0 == h5tools_set_configured_fapl(fapl_id, driver, conf_fa)) {
-                error_msg("unable to set fapl\n");
-                h5tools_setstatus(EXIT_FAILURE);
-                goto done;
-            }
+        if ((fapl_id = h5tools_get_fapl(H5P_DEFAULT, &vfd_info)) < 0) {
+            error_msg("unable to create FAPL for file access\n");
+            h5tools_setstatus(EXIT_FAILURE);
+            goto done;
         }
-    } /* driver defined */
+    } /* driver name defined */
 
     while(opt_ind < argc) {
         fname = HDstrdup(argv[opt_ind++]);
 
-        if (fapl_id != H5P_DEFAULT) {
-            fid = H5Fopen(fname, H5F_ACC_RDONLY, fapl_id);
-        }
-        else {
-            fid = h5tools_fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT, driver, NULL, 0);
-        }
+        fid = h5tools_fopen(fname, H5F_ACC_RDONLY, fapl_id,
+                (fapl_id == H5P_DEFAULT) ? FALSE : TRUE, NULL, 0);
 
         if (fid < 0) {
             error_msg("unable to open file \"%s\"\n", fname);
@@ -1542,23 +1451,23 @@ main(int argc, const char *argv[])
         /* Prepare to find objects that might be targets of a reference */
         fill_ref_path_table(fid);
 
-        if(doxml) {
+        if(doxml_g) {
             /* initialize XML */
             /* reset prefix! */
             HDstrcpy(prefix, "");
 
             /* make sure the URI is initialized to something */
-            if (xml_dtd_uri == NULL) {
-                if (useschema) {
-                    xml_dtd_uri = DEFAULT_XSD;
+            if (xml_dtd_uri_g == NULL) {
+                if (useschema_g) {
+                    xml_dtd_uri_g = DEFAULT_XSD;
                 }
                 else {
-                    xml_dtd_uri = DEFAULT_DTD;
+                    xml_dtd_uri_g = DEFAULT_DTD;
                     xmlnsprefix = "";
                 }
             }
             else {
-                if (useschema && HDstrcmp(xmlnsprefix,"")) {
+                if (useschema_g && HDstrcmp(xmlnsprefix,"")) {
                     error_msg("Cannot set Schema URL for a qualified namespace--use -X or -U option with -D \n");
                     h5tools_setstatus(EXIT_FAILURE);
                     goto done;
@@ -1591,16 +1500,16 @@ main(int argc, const char *argv[])
             } /* end if */
 
         /* start to dump - display file header information */
-        if (!doxml) {
+        if (!doxml_g) {
             begin_obj(h5tools_dump_header_format->filebegin, fname, h5tools_dump_header_format->fileblockbegin);
         }
         else {
             PRINTVALSTREAM(rawoutstream, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
 
             /* alternative first element, depending on schema or DTD. */
-            if (useschema) {
+            if (useschema_g) {
                 if (HDstrcmp(xmlnsprefix,"") == 0) {
-                    PRINTSTREAM(rawoutstream, "<HDF5-File xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"%s\">\n", xml_dtd_uri);
+                    PRINTSTREAM(rawoutstream, "<HDF5-File xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"%s\">\n", xml_dtd_uri_g);
                 }
                 else {
                     /*  TO DO: make -url option work in this case (may need new option) */
@@ -1620,13 +1529,13 @@ main(int argc, const char *argv[])
                 }
             }
             else {
-                PRINTSTREAM(rawoutstream, "<!DOCTYPE HDF5-File PUBLIC \"HDF5-File.dtd\" \"%s\">\n", xml_dtd_uri);
+                PRINTSTREAM(rawoutstream, "<!DOCTYPE HDF5-File PUBLIC \"HDF5-File.dtd\" \"%s\">\n", xml_dtd_uri_g);
                 PRINTVALSTREAM(rawoutstream, "<HDF5-File>\n");
             }
         }
 
-        if (!doxml) {
-            if (display_fi) {
+        if (!doxml_g) {
+            if (dump_opts.display_fi) {
                 PRINTVALSTREAM(rawoutstream, "\n");
                 dump_fcontents(fid);
                 end_obj(h5tools_dump_header_format->fileend,h5tools_dump_header_format->fileblockend);
@@ -1634,20 +1543,20 @@ main(int argc, const char *argv[])
                 goto done;
             }
 
-            if (display_bb)
+            if (dump_opts.display_bb)
                 dump_fcpl(fid);
         }
 
-        if(display_all) {
+        if(dump_opts.display_all) {
             if((gid = H5Gopen2(fid, "/", H5P_DEFAULT)) < 0) {
                 error_msg("unable to open root group\n");
                 h5tools_setstatus(EXIT_FAILURE);
             }
             else {
-                if (!doxml)
+                if (!doxml_g)
                     dump_indent += COL;
                 dump_function_table->dump_group_function(gid, "/" );
-                if (!doxml)
+                if (!doxml_g)
                     dump_indent -= COL;
                 PRINTVALSTREAM(rawoutstream, "\n");
             }
@@ -1660,7 +1569,7 @@ main(int argc, const char *argv[])
         }
         else {
             /* Note: this option is not supported for XML */
-            if(doxml) {
+            if(doxml_g) {
                 error_msg("internal error (file %s:line %d)\n", __FILE__, __LINE__);
                 h5tools_setstatus(EXIT_FAILURE);
                 goto done;
@@ -1674,7 +1583,7 @@ main(int argc, const char *argv[])
             PRINTVALSTREAM(rawoutstream, "\n");
         }
 
-        if (!doxml) {
+        if (!doxml_g) {
             end_obj(h5tools_dump_header_format->fileend, h5tools_dump_header_format->fileblockend);
             PRINTVALSTREAM(rawoutstream, "\n");
         }
@@ -1703,8 +1612,6 @@ main(int argc, const char *argv[])
 
     /* To Do:  clean up XML table */
 
-    H5Eset_auto2(H5E_DEFAULT, func, edata);
-
     leave(h5tools_getstatus());
 
 done:
@@ -1734,8 +1641,6 @@ done:
 
     /* To Do:  clean up XML table */
 
-    H5Eset_auto2(H5E_DEFAULT, func, edata);
-
     leave(h5tools_getstatus());
 } /* main */
 
diff --git a/tools/src/h5dump/h5dump.h b/tools/src/h5dump/h5dump.h
index 801f60d..548af09 100644
--- a/tools/src/h5dump/h5dump.h
+++ b/tools/src/h5dump/h5dump.h
@@ -43,6 +43,7 @@ typedef struct h5dump_table_items_t {
     table_t         *dset_table;    /* Table of datasets */
     table_t         *type_table;    /* Table of datatypes */
 } h5dump_table_items_t;
+
 typedef struct h5dump_table_list_t {
     size_t                  nalloc;
     size_t                  nused;
@@ -51,8 +52,8 @@ typedef struct h5dump_table_list_t {
 
 h5dump_table_list_t  table_list = {0, 0, NULL};
 table_t             *group_table = NULL, *dset_table = NULL, *type_table = NULL;
-unsigned            dump_indent = 0;              /*how far in to indent the line         */
 
+unsigned     dump_indent = 0;    /* how far in to indent the line */
 int          unamedtype = 0;     /* shared datatype with no name */
 hbool_t      hit_elink = FALSE;  /* whether we have traversed an external link */
 size_t       prefix_len = 1024;
@@ -60,23 +61,26 @@ char         *prefix = NULL;
 const char   *fp_format = NULL;
 
 /* things to display or which are set via command line parameters */
-int          display_all       = TRUE;
-int          display_oid       = FALSE;
-int          display_data      = TRUE;
-int          display_attr_data = TRUE;
-int          display_char      = FALSE; /*print 1-byte numbers as ASCII */
-int          usingdasho        = FALSE;
-int          display_bb        = FALSE; /*superblock */
-int          display_dcpl      = FALSE; /*dcpl */
-int          display_fi        = FALSE; /*file index */
-int          display_ai        = TRUE;  /*array index */
-int          display_escape    = FALSE; /*escape non printable characters */
-int          display_region    = FALSE; /*print region reference data */
-int          disable_compact_subset= FALSE; /* disable compact form of subset notation */
-int          display_packed_bits = FALSE; /*print 1-8 byte numbers as packed bits*/
-int          include_attrs     = TRUE; /* Display attributes */
-int          display_vds_first = FALSE; /* vds display to all by default*/
-int          vds_gap_size       = 0; /* vds skip missing files default is none */
+typedef struct {
+    int          display_all;
+    int          display_oid;
+    int          display_data;
+    int          display_attr_data;
+    int          display_char;           /* print 1-byte numbers as ASCII */
+    int          usingdasho;
+    int          display_bb;             /* superblock */
+    int          display_dcpl;           /* dcpl */
+    int          display_fi;             /* file index */
+    int          display_ai;             /* array index */
+    int          display_escape;         /* escape non printable characters */
+    int          display_region;         /* print region reference data */
+    int          disable_compact_subset; /* disable compact form of subset notation */
+    int          display_packed_bits;    /* print 1-8 byte numbers as packed bits */
+    int          include_attrs;          /* Display attributes */
+    int          display_vds_first;      /* vds display to all by default */
+    int          vds_gap_size;           /* vds skip missing files default is none */
+} dump_opt_t;
+dump_opt_t dump_opts = {TRUE, FALSE, TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, TRUE, FALSE, 0};
 
 #define PACKED_BITS_MAX         8  /* Maximum number of packed-bits to display */
 #define PACKED_BITS_SIZE_MAX    (8*sizeof(long long))  /* Maximum bits size of integer types of packed-bits */
diff --git a/tools/src/h5dump/h5dump_ddl.c b/tools/src/h5dump/h5dump_ddl.c
index 64ccfe0..c752fbb 100644
--- a/tools/src/h5dump/h5dump_ddl.c
+++ b/tools/src/h5dump/h5dump_ddl.c
@@ -103,13 +103,13 @@ dump_attr_cb(hid_t oid, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *
     HDmemset(&ctx, 0, sizeof(ctx));
     ctx.indent_level = dump_indent / COL;
     ctx.cur_column = dump_indent;
-    ctx.display_index = display_ai;
-    ctx.display_char = display_char;
+    ctx.display_index = dump_opts.display_ai;
+    ctx.display_char = dump_opts.display_char;
 
     attr_id = H5Aopen(oid, attr_name, H5P_DEFAULT);
-    oid_output = display_oid;
-    data_output = display_data;
-    attr_data_output = display_attr_data;
+    oid_output = dump_opts.display_oid;
+    data_output = dump_opts.display_data;
+    attr_data_output = dump_opts.display_attr_data;
 
     string_dataformat = *outputformat;
 
@@ -125,7 +125,7 @@ dump_attr_cb(hid_t oid, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *
     else
         string_dataformat.line_ncols = h5tools_nCols;
 
-    string_dataformat.do_escape = display_escape;
+    string_dataformat.do_escape = dump_opts.display_escape;
     outputformat = &string_dataformat;
 
     h5dump_type_table = type_table;
@@ -185,7 +185,7 @@ dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR
     else
         string_dataformat.line_ncols = h5tools_nCols;
 
-    string_dataformat.do_escape = display_escape;
+    string_dataformat.do_escape = dump_opts.display_escape;
     outputformat = &string_dataformat;
 
     /* Build the object's path name */
@@ -242,16 +242,16 @@ dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR
             break;
 
         case H5O_TYPE_DATASET:
-            if(display_data) {
+            if(dump_opts.display_data) {
                 if ((dapl_id = H5Pcreate(H5P_DATASET_ACCESS)) < 0) {
                     error_msg("error in creating default access property list ID\n");
                 }
-                if (display_vds_first) {
+                if (dump_opts.display_vds_first) {
                     if(H5Pset_virtual_view(dapl_id, H5D_VDS_FIRST_MISSING) < 0)
                         error_msg("error in setting access property list ID, virtual_view\n");
                 }
-                if (vds_gap_size > 0) {
-                    if(H5Pset_virtual_printf_gap(dapl_id, (hsize_t)vds_gap_size) < 0)
+                if (dump_opts.vds_gap_size > 0) {
+                    if(H5Pset_virtual_printf_gap(dapl_id, (hsize_t)dump_opts.vds_gap_size) < 0)
                         error_msg("error in setting access property list ID, virtual_printf_gap\n");
                 }
             }
@@ -564,7 +564,7 @@ attr_iteration(hid_t gid, unsigned attr_crt_order_flags)
 {
     /* attribute iteration: if there is a request to do H5_INDEX_CRT_ORDER and tracking order is set
        in the group for attributes, then, sort by creation order, otherwise by name */
-    if(include_attrs) {
+    if(dump_opts.include_attrs) {
         if((sort_by == H5_INDEX_CRT_ORDER) && (attr_crt_order_flags & H5P_CRT_ORDER_TRACKED)) {
             if(H5Aiterate2(gid, sort_by, sort_order, NULL, dump_attr_cb, NULL) < 0) {
                 error_msg("error getting attribute information\n");
@@ -641,7 +641,7 @@ dump_named_datatype(hid_t tid, const char *name)
     else
         string_dataformat.line_ncols = h5tools_nCols;
 
-    string_dataformat.do_escape = display_escape;
+    string_dataformat.do_escape = dump_opts.display_escape;
     outputformat = &string_dataformat;
 
     if ((tcpl_id = H5Tget_create_plist(tid)) < 0) {
@@ -794,7 +794,7 @@ dump_group(hid_t gid, const char *name)
     else
         string_dataformat.line_ncols = h5tools_nCols;
 
-    string_dataformat.do_escape = display_escape;
+    string_dataformat.do_escape = dump_opts.display_escape;
     outputformat = &string_dataformat;
 
     ctx.need_prefix = TRUE;
@@ -824,7 +824,7 @@ dump_group(hid_t gid, const char *name)
             }
     } /* end if */
 
-    if(display_oid)
+    if(dump_opts.display_oid)
         h5tools_dump_oid(rawoutstream, outputformat, &ctx, gid);
 
     h5tools_dump_comment(rawoutstream, outputformat, &ctx, gid);
@@ -919,7 +919,7 @@ dump_dataset(hid_t did, const char *name, struct subset_t *sset)
     else
         string_dataformat.line_ncols = h5tools_nCols;
 
-    string_dataformat.do_escape = display_escape;
+    string_dataformat.do_escape = dump_opts.display_escape;
     outputformat = &string_dataformat;
 
     if ((dcpl_id = H5Dget_create_plist(did)) < 0) {
@@ -960,11 +960,11 @@ dump_dataset(hid_t did, const char *name, struct subset_t *sset)
     h5tools_dump_dataspace(rawoutstream, outputformat, &ctx, space);
     H5Sclose(space);
 
-    if(display_oid) {
+    if(dump_opts.display_oid) {
         h5tools_dump_oid(rawoutstream, outputformat, &ctx, did);
     }
 
-    if(display_dcpl) {
+    if(dump_opts.display_dcpl) {
         h5dump_type_table = type_table;
         h5tools_dump_dcpl(rawoutstream, outputformat, &ctx, dcpl_id, type, did);
         h5dump_type_table = NULL;
@@ -972,16 +972,16 @@ dump_dataset(hid_t did, const char *name, struct subset_t *sset)
     H5Pclose(dcpl_id);
 
     ctx.sset = sset;
-    ctx.display_index = display_ai;
-    ctx.display_char = display_char;
-    if(display_data) {
+    ctx.display_index = dump_opts.display_ai;
+    ctx.display_char = dump_opts.display_char;
+    if(dump_opts.display_data) {
         unsigned  data_loop = 1;
         unsigned  u;
 
-        if(display_packed_bits)
+        if(dump_opts.display_packed_bits)
             data_loop = packed_bits_num;
         for(u = 0; u < data_loop; u++) {
-            if(display_packed_bits) {
+            if(dump_opts.display_packed_bits) {
                 ctx.need_prefix = TRUE;
                 h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
                 /* Render the element */
@@ -1084,7 +1084,7 @@ dump_data(hid_t obj_id, int obj_data, struct subset_t *sset, int display_index)
     else
         string_dataformat.line_ncols = h5tools_nCols;
 
-    string_dataformat.do_escape = display_escape;
+    string_dataformat.do_escape = dump_opts.display_escape;
     outputformat = &string_dataformat;
 
     HDmemset(&ctx, 0, sizeof(ctx));
@@ -1092,7 +1092,7 @@ dump_data(hid_t obj_id, int obj_data, struct subset_t *sset, int display_index)
     ctx.cur_column = dump_indent;
     ctx.sset = sset;
     ctx.display_index = display_index;
-    ctx.display_char = display_char;
+    ctx.display_char = dump_opts.display_char;
 
     if(obj_data == DATASET_DATA)
         print_dataset = TRUE;
@@ -1502,8 +1502,8 @@ handle_attributes(hid_t fid, const char *attr, void H5_ATTR_UNUSED *data, int H5
     HDmemset(&ctx, 0, sizeof(ctx));
     ctx.indent_level = dump_indent / COL;
     ctx.cur_column = dump_indent;
-    ctx.display_index = display_ai;
-    ctx.display_char = display_char;
+    ctx.display_index = dump_opts.display_ai;
+    ctx.display_char = dump_opts.display_char;
 
     string_dataformat = *outputformat;
 
@@ -1519,7 +1519,7 @@ handle_attributes(hid_t fid, const char *attr, void H5_ATTR_UNUSED *data, int H5
     else
         string_dataformat.line_ncols = h5tools_nCols;
 
-    string_dataformat.do_escape = display_escape;
+    string_dataformat.do_escape = dump_opts.display_escape;
     outputformat = &string_dataformat;
 
     attr_name = h5tools_str_replace(attr + j + 1, "\\/", "/");
@@ -1558,9 +1558,9 @@ handle_attributes(hid_t fid, const char *attr, void H5_ATTR_UNUSED *data, int H5
     } /* end if */
 
     attr_id = H5Aopen(oid, attr_name, H5P_DEFAULT);
-    oid_output = display_oid;
-    data_output = display_data;
-    attr_data_output = display_attr_data;
+    oid_output = dump_opts.display_oid;
+    data_output = dump_opts.display_data;
+    attr_data_output = dump_opts.display_attr_data;
 
     h5dump_type_table = type_table;
     h5tools_dump_attribute(rawoutstream, outputformat, &ctx, attr_name, attr_id);
@@ -1612,16 +1612,16 @@ handle_datasets(hid_t fid, const char *dset, void *data, int pe, const char *dis
     struct subset_t *sset = (struct subset_t *)data;
     const char      *real_name = display_name ? display_name : dset;
 
-    if(display_data) {
+    if(dump_opts.display_data) {
         if ((dapl_id = H5Pcreate(H5P_DATASET_ACCESS)) < 0) {
             error_msg("error in creating default access property list ID\n");
         }
-        if (display_vds_first) {
+        if (dump_opts.display_vds_first) {
             if(H5Pset_virtual_view(dapl_id, H5D_VDS_FIRST_MISSING) < 0)
                 error_msg("error in setting access property list ID, virtual_view\n");
         }
-        if (vds_gap_size > 0) {
-            if(H5Pset_virtual_printf_gap(dapl_id, (hsize_t)vds_gap_size) < 0)
+        if (dump_opts.vds_gap_size > 0) {
+            if(H5Pset_virtual_printf_gap(dapl_id, (hsize_t)dump_opts.vds_gap_size) < 0)
                 error_msg("error in setting access property list ID, virtual_printf_gap\n");
         }
     }
diff --git a/tools/src/h5dump/h5dump_extern.h b/tools/src/h5dump/h5dump_extern.h
index 00d3bd2..c615621 100644
--- a/tools/src/h5dump/h5dump_extern.h
+++ b/tools/src/h5dump/h5dump_extern.h
@@ -50,32 +50,35 @@ typedef struct h5dump_table_list_t {
 
 extern h5dump_table_list_t  table_list;
 extern table_t             *group_table, *dset_table, *type_table;
-extern unsigned                  dump_indent;              /*how far in to indent the line         */
 
-extern int          unamedtype;     /* shared datatype with no name */
-extern hbool_t      hit_elink;  /* whether we have traversed an external link */
+extern unsigned     dump_indent;  /* how far in to indent the line */
+extern int          unamedtype;   /* shared datatype with no name */
+extern hbool_t      hit_elink;    /* whether we have traversed an external link */
 extern size_t       prefix_len;
 extern char         *prefix;
 extern const char   *fp_format;
 
 /* things to display or which are set via command line parameters */
-extern int          display_all;
-extern int          display_oid;
-extern int          display_data;
-extern int          display_attr_data;
-extern int          display_char; /*print 1-byte numbers as ASCII */
-extern int          usingdasho;
-extern int          display_bb; /*superblock */
-extern int          display_dcpl; /*dcpl */
-extern int          display_fi; /*file index */
-extern int          display_ai;  /*array index */
-extern int          display_escape; /*escape non printable characters */
-extern int          display_region; /*print region reference data */
-extern int          disable_compact_subset; /* disable compact form of subset notation */
-extern int          display_packed_bits; /*print 1-8 byte numbers as packed bits*/
-extern int          include_attrs; /* Display attributes */
-extern int          display_vds_first; /* vds display to first missing */
-extern int          vds_gap_size; /* vds skip missing files */
+typedef struct {
+    int          display_all;
+    int          display_oid;
+    int          display_data;
+    int          display_attr_data;
+    int          display_char;           /* print 1-byte numbers as ASCII */
+    int          usingdasho;
+    int          display_bb;             /* superblock */
+    int          display_dcpl;           /* dcpl */
+    int          display_fi;             /* file index */
+    int          display_ai;             /* array index */
+    int          display_escape;         /* escape non printable characters */
+    int          display_region;         /* print region reference data */
+    int          disable_compact_subset; /* disable compact form of subset notation */
+    int          display_packed_bits;    /* print 1-8 byte numbers as packed bits */
+    int          include_attrs;          /* Display attributes */
+    int          display_vds_first;      /* vds display to all by default */
+    int          vds_gap_size;           /* vds skip missing files default is none */
+} dump_opt_t;
+extern dump_opt_t dump_opts;
 
 #define PACKED_BITS_MAX         8  /* Maximum number of packed-bits to display */
 #define PACKED_BITS_SIZE_MAX    8*sizeof(long long)  /* Maximum bits size of integer types of packed-bits */
diff --git a/tools/src/h5dump/h5dump_xml.c b/tools/src/h5dump/h5dump_xml.c
index ae8b9c7..f2cca21 100644
--- a/tools/src/h5dump/h5dump_xml.c
+++ b/tools/src/h5dump/h5dump_xml.c
@@ -162,7 +162,7 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_
     else
         string_dataformat.line_ncols = h5tools_nCols;
 
-    string_dataformat.do_escape = display_escape;
+    string_dataformat.do_escape = dump_opts.display_escape;
     outputformat = &string_dataformat;
 
     /* Build the object's path name */
@@ -609,7 +609,7 @@ xml_name_to_XID(const char *str , char *outstr, int outlen, int gen)
 
     HDsprintf(outstr, "xid_"H5_PRINTF_HADDR_FMT, objno);
 
-    return(0);
+    return 0;
 }
 
 static const char      *quote = "&quot;";
@@ -719,15 +719,15 @@ xml_escape_the_name(const char *str)
  * Programmer:  REMcG
  *-------------------------------------------------------------------------
  */
-static char                   *
+static char *
 xml_escape_the_string(const char *str, int slen)
 {
     size_t      extra;
     size_t      len;
     size_t      i;
-    const char *cp;
-    char       *ncp;
-    char       *rcp;
+    const char *cp = NULL;
+    char       *ncp = NULL;
+    char       *rcp = NULL;
     size_t      ncp_len;
 
     if (!str)
@@ -770,29 +770,31 @@ xml_escape_the_string(const char *str, int slen)
 
         if (*cp == '\\') {
             *ncp++ = '\\';
+            ncp_len--;
             *ncp = *cp;
             esc_len = 1;
         }
         else if (*cp == '\"') {
             *ncp++ = '\\';
+            ncp_len--;
             *ncp = *cp;
             esc_len = 1;
         }
         else if (*cp == '\'') {
+            HDstrncpy(ncp, apos, ncp_len);
             esc_len = HDstrlen(apos);
-            HDstrncpy(ncp, apos, esc_len);
         }
         else if (*cp == '<') {
+            HDstrncpy(ncp, lt, ncp_len);
             esc_len = HDstrlen(lt);
-            HDstrncpy(ncp, lt, esc_len);
         }
         else if (*cp == '>') {
+            HDstrncpy(ncp, gt, ncp_len);
             esc_len = HDstrlen(gt);
-            HDstrncpy(ncp, gt, esc_len);
         }
         else if (*cp == '&') {
+            HDstrncpy(ncp, amp, ncp_len);
             esc_len = HDstrlen(amp);
-            HDstrncpy(ncp, amp, esc_len);
         }
         else {
             *ncp = *cp;
@@ -873,7 +875,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
     else
         string_dataformat.line_ncols = h5tools_nCols;
 
-    string_dataformat.do_escape = display_escape;
+    string_dataformat.do_escape = dump_opts.display_escape;
     outputformat = &string_dataformat;
 
     if(!in_group && H5Tcommitted(type) > 0) {
@@ -1523,7 +1525,7 @@ xml_dump_datatype(hid_t type)
     else
         string_dataformat.line_ncols = h5tools_nCols;
 
-    string_dataformat.do_escape = display_escape;
+    string_dataformat.do_escape = dump_opts.display_escape;
     outputformat = &string_dataformat;
 
     ctx.indent_level++;
@@ -1654,7 +1656,7 @@ xml_dump_dataspace(hid_t space)
     else
         string_dataformat.line_ncols = h5tools_nCols;
 
-    string_dataformat.do_escape = display_escape;
+    string_dataformat.do_escape = dump_opts.display_escape;
     outputformat = &string_dataformat;
 
     ctx.indent_level++;
@@ -1977,7 +1979,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
     else
         string_dataformat.line_ncols = h5tools_nCols;
 
-    string_dataformat.do_escape = display_escape;
+    string_dataformat.do_escape = dump_opts.display_escape;
     outputformat = &string_dataformat;
 
     ctx.need_prefix = TRUE;
@@ -1999,7 +2001,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
         ctx.indent_level++;
         dump_indent += COL;
 
-        if (display_attr_data && space_type != H5S_NULL) {
+        if (dump_opts.display_attr_data && space_type != H5S_NULL) {
             switch (H5Tget_class(type)) {
             case H5T_INTEGER:
             case H5T_FLOAT:
@@ -2278,7 +2280,7 @@ xml_dump_named_datatype(hid_t type, const char *name)
     else
         string_dataformat.line_ncols = h5tools_nCols;
 
-    string_dataformat.do_escape = display_escape;
+    string_dataformat.do_escape = dump_opts.display_escape;
     outputformat = &string_dataformat;
 
     dtxid = (char *)HDmalloc((size_t)100);
@@ -2491,7 +2493,7 @@ xml_dump_group(hid_t gid, const char *name)
     else
         string_dataformat.line_ncols = h5tools_nCols;
 
-    string_dataformat.do_escape = display_escape;
+    string_dataformat.do_escape = dump_opts.display_escape;
     outputformat = &string_dataformat;
 
     if(HDstrcmp(name, "/") == 0) {
@@ -2867,7 +2869,7 @@ xml_print_refs(hid_t did, int source)
     else
         string_dataformat.line_ncols = h5tools_nCols;
 
-    string_dataformat.do_escape = display_escape;
+    string_dataformat.do_escape = dump_opts.display_escape;
     outputformat = &string_dataformat;
 
     for (i = 0; i < (hsize_t)ssiz; i++) {
@@ -3015,7 +3017,7 @@ xml_print_strs(hid_t did, int source)
     else
         string_dataformat.line_ncols = h5tools_nCols;
 
-    string_dataformat.do_escape = display_escape;
+    string_dataformat.do_escape = dump_opts.display_escape;
     outputformat = &string_dataformat;
 
     for (i = 0; i < (hsize_t)ssiz; i++) {
@@ -3127,7 +3129,7 @@ check_filters(hid_t dcpl)
     else
         string_dataformat.line_ncols = h5tools_nCols;
 
-    string_dataformat.do_escape = display_escape;
+    string_dataformat.do_escape = dump_opts.display_escape;
     outputformat = &string_dataformat;
 
     nfilt = H5Pget_nfilters(dcpl);
@@ -3263,7 +3265,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
     else
         string_dataformat.line_ncols = h5tools_nCols;
 
-    string_dataformat.do_escape = display_escape;
+    string_dataformat.do_escape = dump_opts.display_escape;
     outputformat = &string_dataformat;
 
     ctx.indent_level++;
@@ -3601,7 +3603,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
     else
         string_dataformat.line_ncols = h5tools_nCols;
 
-    string_dataformat.do_escape = display_escape;
+    string_dataformat.do_escape = dump_opts.display_escape;
     outputformat = &string_dataformat;
 
     xml_name_to_XID(tmp, rstr, 100, 1);
@@ -3890,7 +3892,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
     dump_indent -= COL;
     tempi = H5Dget_storage_size(did);
 
-    if (display_data && (tempi > 0)) {
+    if (dump_opts.display_data && (tempi > 0)) {
         switch (H5Tget_class(type)) {
         case H5T_INTEGER:
         case H5T_FLOAT:
@@ -4146,7 +4148,7 @@ xml_print_enum(hid_t type)
     else
         string_dataformat.line_ncols = h5tools_nCols;
 
-    string_dataformat.do_escape = display_escape;
+    string_dataformat.do_escape = dump_opts.display_escape;
     outputformat = &string_dataformat;
 
     nmembs = (unsigned)H5Tget_nmembers(type);
diff --git a/tools/src/h5format_convert/h5format_convert.c b/tools/src/h5format_convert/h5format_convert.c
index ccea78d..fda5fe9 100644
--- a/tools/src/h5format_convert/h5format_convert.c
+++ b/tools/src/h5format_convert/h5format_convert.c
@@ -42,13 +42,13 @@ static int verbose_g = 0;
 static const char *s_opts = "hVvd:n";
 static struct long_options l_opts[] = {
         { "help", no_arg, 'h' },
-	{ "hel", no_arg, 'h'},
-	{ "he", no_arg, 'h'},
+        { "hel", no_arg, 'h'},
+        { "he", no_arg, 'h'},
         { "version", no_arg, 'V' },
-	{ "version", no_arg, 'V' },
-	{ "versio", no_arg, 'V' },
-	{ "versi", no_arg, 'V' },
-	{ "vers", no_arg, 'V' },
+        { "version", no_arg, 'V' },
+        { "versio", no_arg, 'V' },
+        { "versi", no_arg, 'V' },
+        { "vers", no_arg, 'V' },
         { "verbose", no_arg, 'v' },
         { "verbos", no_arg, 'v' },
         { "verbo", no_arg, 'v' },
@@ -60,10 +60,11 @@ static struct long_options l_opts[] = {
         { "noop", no_arg, 'n' },
         { "noo", no_arg, 'n' },
         { "no", no_arg, 'n' },
+        { "enable-error-stack", no_arg, 'E' },
         { NULL, 0, '\0' }
 };
 
-
+
 /*-------------------------------------------------------------------------
  * Function: usage
  *
@@ -108,7 +109,7 @@ static void usage(const char *prog)
  * Purpose: parse command line input
  *
  * Return: Success: 0
- *  	   Failure: 1
+ *         Failure: 1
  *
  *-------------------------------------------------------------------------
  */
@@ -120,55 +121,59 @@ parse_command_line(int argc, const char **argv)
      /* no arguments */
     if (argc == 1) {
         usage(h5tools_getprogname());
-	h5tools_setstatus(EXIT_FAILURE);
+        h5tools_setstatus(EXIT_FAILURE);
         goto error;
     }
 
     /* parse command line options */
     while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF) {
-	switch((char) opt) {
-	    case 'h':
-		usage(h5tools_getprogname());
-		h5tools_setstatus(EXIT_SUCCESS);
-		goto error;
-
-	    case 'V':
-		print_version(h5tools_getprogname());
-		h5tools_setstatus(EXIT_SUCCESS);
-		goto error;
-
-	    case 'v':
-		verbose_g = TRUE;
-		break;
-
-	    case 'd': /* -d dname */
-		if(opt_arg != NULL && *opt_arg)
-		    dname_g = HDstrdup(opt_arg);
-		if(dname_g == NULL) {
-		    h5tools_setstatus(EXIT_FAILURE);
-		    error_msg("No dataset name\n", opt_arg);
-		    usage(h5tools_getprogname());
-		    goto error;
-		}
-		dset_g = TRUE;
-		break;
-
-	    case 'n': /* -n */
-		noop_g = TRUE;
-		break;
-
-	    default:
-		h5tools_setstatus(EXIT_FAILURE);
-		usage(h5tools_getprogname());
-		goto error;
-		break;
-	} /* switch */
+        switch((char) opt) {
+            case 'h':
+                usage(h5tools_getprogname());
+                h5tools_setstatus(EXIT_SUCCESS);
+                goto error;
+
+            case 'V':
+                print_version(h5tools_getprogname());
+                h5tools_setstatus(EXIT_SUCCESS);
+                goto error;
+
+            case 'v':
+                verbose_g = TRUE;
+                break;
+
+            case 'd': /* -d dname */
+                if(opt_arg != NULL && *opt_arg)
+                    dname_g = HDstrdup(opt_arg);
+                if(dname_g == NULL) {
+                    h5tools_setstatus(EXIT_FAILURE);
+                    error_msg("No dataset name\n", opt_arg);
+                    usage(h5tools_getprogname());
+                    goto error;
+                }
+                dset_g = TRUE;
+                break;
+
+            case 'n': /* -n */
+                noop_g = TRUE;
+                break;
+
+            case 'E':
+                enable_error_stack = 1;
+                break;
+
+            default:
+                h5tools_setstatus(EXIT_FAILURE);
+                usage(h5tools_getprogname());
+                goto error;
+                break;
+        } /* switch */
     } /* while */
 
     if (argc <= opt_ind) {
         error_msg("missing file name\n");
         usage(h5tools_getprogname());
-	h5tools_setstatus(EXIT_FAILURE);
+        h5tools_setstatus(EXIT_FAILURE);
         goto error;
     }
 
@@ -180,7 +185,7 @@ error:
     return(-1); ;
 } /* parse_command_line() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: leave
  *
@@ -202,17 +207,17 @@ leave(int ret)
  * Function: convert()
  *
  * Purpose: To downgrade a dataset's indexing type or layout version:
- *		For chunked:
- *		  Downgrade the chunk indexing type to version 1 B-tree
- *	    	  If type is already version 1 B-tree, no further action
- *		For compact/contiguous:
- *		  Downgrade the layout version from 4 to 3
- *		  If version is already <= 3, no further action
- *		For virtual:
- *		  No further action
+ *        For chunked:
+ *          Downgrade the chunk indexing type to version 1 B-tree
+ *              If type is already version 1 B-tree, no further action
+ *        For compact/contiguous:
+ *          Downgrade the layout version from 4 to 3
+ *          If version is already <= 3, no further action
+ *        For virtual:
+ *          No further action
  *
  * Return: Success: 0
- *  	   Failure: 1
+ *         Failure: 1
  *
  *-------------------------------------------------------------------------
  */
@@ -307,7 +312,7 @@ convert(hid_t fid, const char *dname)
     }
 
     if(verbose_g)
-	HDfprintf(stdout, "Converting the dataset...\n");
+        HDfprintf(stdout, "Converting the dataset...\n");
 
     /* Downgrade the dataset */
     if(H5Dformat_convert(did) < 0) {
@@ -372,7 +377,7 @@ convert_dsets_cb(const char *path, const H5O_info_t *oi, const char *already_vis
             if(verbose_g)
                 HDfprintf(stdout, "Going to process dataset:%s...\n", path);
             if(convert(fid, path) < 0)
-            goto error;
+                goto error;
         } /* end if */
     } /* end if */
 
@@ -382,62 +387,61 @@ error:
     return -1;
 } /* end convert_dsets_cb() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: main
  *
  * Purpose: To convert the chunk indexing type of a dataset in a file to
- *	    version 1 B-tree.
+ *        version 1 B-tree.
  *
  * Return: Success: 0
- *  	   Failure: 1
+ *         Failure: 1
  *
  *-------------------------------------------------------------------------
  */
 int
 main(int argc, const char *argv[])
 {
-    H5E_auto2_t func;
-    void *edata;
     hid_t fid = H5I_INVALID_HID;
 
     h5tools_setprogname(PROGRAMNAME);
     h5tools_setstatus(EXIT_SUCCESS);
 
-    /* Disable error reporting */
-    H5Eget_auto2(H5E_DEFAULT, &func, &edata);
-    H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
-
     /* Initialize h5tools lib */
     h5tools_init();
 
     /* Parse command line options */
     if(parse_command_line(argc, argv) < 0)
-	goto done;
+        goto done;
     else if(verbose_g)
-	HDfprintf(stdout, "Process command line options\n");
+        HDfprintf(stdout, "Process command line options\n");
 
     if(noop_g && verbose_g)
-	HDfprintf(stdout, "It is noop...\n");
+        HDfprintf(stdout, "It is noop...\n");
+
+    /* enable error reporting if command line option */
+    h5tools_error_report();
 
     /* Open the HDF5 file */
-    if((fid = h5tools_fopen(fname_g, H5F_ACC_RDWR, H5P_DEFAULT, NULL, NULL, 0)) < 0) {
-	error_msg("unable to open file \"%s\"\n", fname_g);
-	h5tools_setstatus(EXIT_FAILURE);
-	goto done;
-    } else if(verbose_g)
-	HDfprintf(stdout, "Open the file %s\n", fname_g);
+    if((fid = h5tools_fopen(fname_g, H5F_ACC_RDWR, H5P_DEFAULT, FALSE, NULL, 0)) < 0) {
+        error_msg("unable to open file \"%s\"\n", fname_g);
+        h5tools_setstatus(EXIT_FAILURE);
+        goto done;
+    }
+    else if(verbose_g)
+        HDfprintf(stdout, "Open the file %s\n", fname_g);
 
     if(dset_g) { /* Convert a specified dataset in the file */
-	if(verbose_g)
-	    HDfprintf(stdout, "Going to process dataset: %s...\n", dname_g);
-	if(convert(fid, dname_g) < 0)
-	    goto done;
-    } else { /* Convert all datasets in the file */
-	if(verbose_g)
-	    HDfprintf(stdout, "Processing all datasets in the file...\n");
-	if(h5trav_visit(fid, "/", TRUE, TRUE, convert_dsets_cb, NULL, &fid, H5O_INFO_BASIC) < 0)
-	    goto done;
+        if(verbose_g)
+            HDfprintf(stdout, "Going to process dataset: %s...\n", dname_g);
+        if(convert(fid, dname_g) < 0)
+            goto done;
+    }
+    else { /* Convert all datasets in the file */
+        if(verbose_g)
+            HDfprintf(stdout, "Processing all datasets in the file...\n");
+        if(h5trav_visit(fid, "/", TRUE, TRUE, convert_dsets_cb, NULL, &fid, H5O_INFO_BASIC) < 0)
+            goto done;
     } /* end else */
 
     if(verbose_g) {
@@ -459,19 +463,20 @@ main(int argc, const char *argv[])
 done:
     /* Close the file */
     if(fid >= 0) {
-	if(H5Fclose(fid) < 0) {
-	    error_msg("unable to close file \"%s\"\n", fname_g);
-	    h5tools_setstatus(EXIT_FAILURE);
-	} else if(verbose_g)
-	    HDfprintf(stdout, "Close the file\n");
+        if(H5Fclose(fid) < 0) {
+            error_msg("unable to close file \"%s\"\n", fname_g);
+            h5tools_setstatus(EXIT_FAILURE);
+        }
+        else if(verbose_g) {
+            HDfprintf(stdout, "Close the file\n");
+        }
     }  /* end if */
 
     if(fname_g)
-	HDfree(fname_g);
+        HDfree(fname_g);
     if(dname_g)
-	HDfree(dname_g);
+        HDfree(dname_g);
 
-    H5Eset_auto2(H5E_DEFAULT, func, edata);
     leave(h5tools_getstatus());
 
 } /* end main() */
diff --git a/tools/src/h5import/h5import.c b/tools/src/h5import/h5import.c
index f87f371..b11fe7f 100644
--- a/tools/src/h5import/h5import.c
+++ b/tools/src/h5import/h5import.c
@@ -72,7 +72,7 @@ uint64_t    swap_uint64(uint64_t val);
 
 int main(int argc, char *argv[])
 {
-    struct Options  opt;
+    struct Options *opt;
     int             outfile_named = FALSE;
     int             token;
     int             i;
@@ -99,8 +99,8 @@ int main(int argc, char *argv[])
     (void) HDsetvbuf(stderr, (char *) NULL, _IOLBF, 0);
     (void) HDsetvbuf(stdout, (char *) NULL, _IOLBF, 0);
 
-    /* Initialize the file structure to 0 */
-    HDmemset(&opt, 0, sizeof(struct Options));
+    if((opt = (struct Options *)HDcalloc(1, sizeof(struct Options))) == NULL)
+        goto err;
 
     if (argv[1] && (HDstrcmp("-V", argv[1]) == 0)) {
         print_version(PROGRAMNAME);
@@ -130,12 +130,12 @@ int main(int argc, char *argv[])
         switch (state) {
 
         case 1: /* counting input files */
-            if (opt.fcount < 29) {
-                (void) HDstrcpy(opt.infiles[opt.fcount].datafile, argv[i]);
-                in = &(opt.infiles[opt.fcount].in);
-                opt.infiles[opt.fcount].config = 0;
-                setDefaultValues(in, opt.fcount);
-                opt.fcount++;
+            if (opt->fcount < 29) {
+                (void) HDstrcpy(opt->infiles[opt->fcount].datafile, argv[i]);
+                in = &(opt->infiles[opt->fcount].in);
+                opt->infiles[opt->fcount].config = 0;
+                setDefaultValues(in, opt->fcount);
+                opt->fcount++;
             }
             else {
                 (void) HDfprintf(stderr, err9, argv[i]);
@@ -148,8 +148,8 @@ int main(int argc, char *argv[])
             break;
 
         case 3: /* get configfile name */
-            (void) HDstrcpy(opt.infiles[opt.fcount-1].configfile, argv[i]);
-            opt.infiles[opt.fcount - 1].config = 1;
+            (void) HDstrcpy(opt->infiles[opt->fcount-1].configfile, argv[i]);
+            opt->infiles[opt->fcount - 1].config = 1;
             break;
 
         case 4: /* -o found; look for outfile */
@@ -160,7 +160,7 @@ int main(int argc, char *argv[])
                 (void) HDfprintf(stderr, err10, argv[i]);
                 goto err;
             }
-            (void) HDstrcpy(opt.outfile, argv[i]);
+            (void) HDstrcpy(opt->outfile, argv[i]);
             outfile_named = TRUE;
             break;
 
@@ -232,11 +232,11 @@ int main(int argc, char *argv[])
         goto err;
     }
 
-    if (process(&opt) == -1)
+    if (process(opt) == -1)
         goto err;
 
-    for (i = 0; i < opt.fcount; i++) {
-        in = &(opt.infiles[i].in);
+    for (i = 0; i < opt->fcount; i++) {
+        in = &(opt->infiles[i].in);
         if (in->sizeOfDimension)
             HDfree(in->sizeOfDimension);
         if (in->sizeOfChunk)
@@ -248,12 +248,13 @@ int main(int argc, char *argv[])
         if (in->data)
             HDfree(in->data);
     }
+    HDfree(opt);
 
-    return (EXIT_SUCCESS);
+    return EXIT_SUCCESS;
 err:
     (void) HDfprintf(stderr, "%s", err4);
-    for (i = 0; i < opt.fcount; i++) {
-        in = &(opt.infiles[i].in);
+    for (i = 0; i < opt->fcount; i++) {
+        in = &(opt->infiles[i].in);
         if (in->sizeOfDimension)
             HDfree(in->sizeOfDimension);
         if (in->sizeOfChunk)
@@ -265,7 +266,9 @@ err:
         if (in->data)
             HDfree(in->data);
     }
-    return (EXIT_FAILURE);
+    HDfree(opt);
+
+    return EXIT_FAILURE;
 }
 
 static int gtoken(char *s)
diff --git a/tools/src/h5jam/h5jam.c b/tools/src/h5jam/h5jam.c
index de316c3..56ed66b 100644
--- a/tools/src/h5jam/h5jam.c
+++ b/tools/src/h5jam/h5jam.c
@@ -120,13 +120,6 @@ usage (const char *prog)
 static void
 leave(int ret)
 {
-    if (ub_file)
-        HDfree (ub_file);
-    if (input_file)
-        HDfree (input_file);
-    if (output_file)
-        HDfree (output_file);
-
     h5tools_close();
 
     HDexit(ret);
@@ -148,7 +141,7 @@ parse_command_line (int argc, const char *argv[])
   int opt = FALSE;
 
   /* parse command line options */
-  while ((opt = get_option (argc, argv, s_opts, l_opts)) != EOF)
+  while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF)
     {
       switch ((char) opt)
       {
@@ -195,8 +188,6 @@ main (int argc, const char *argv[])
     int         ufid = -1;
     int         h5fid = -1;
     int         ofid = -1;
-    void       *edata;
-    H5E_auto2_t func;
     hid_t       ifile = H5I_INVALID_HID;
     hid_t       plist = H5I_INVALID_HID;
     herr_t      status;
@@ -214,20 +205,20 @@ main (int argc, const char *argv[])
     h5tools_setprogname(PROGRAMNAME);
     h5tools_setstatus(EXIT_SUCCESS);
 
-    /* Disable error reporting */
-    H5Eget_auto2(H5E_DEFAULT, &func, &edata);
-    H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
-
     /* Initialize h5tools lib */
     h5tools_init();
 
     parse_command_line(argc, argv);
 
+    /* enable error reporting if command line option */
+    h5tools_error_report();
+
     if (ub_file == NULL) {
         /* no user block */
         error_msg("missing argument for -u <user_file>.\n");
         help_ref_msg(stderr);
-        leave (EXIT_FAILURE);
+        h5tools_setstatus(EXIT_FAILURE);
+        goto done;
     }
 
     testval = H5Fis_hdf5 (ub_file);
@@ -235,13 +226,15 @@ main (int argc, const char *argv[])
     if (testval > 0) {
         error_msg("-u <user_file> cannot be HDF5 file, but it appears to be an HDF5 file.\n");
         help_ref_msg(stderr);
-        leave (EXIT_FAILURE);
+        h5tools_setstatus(EXIT_FAILURE);
+        goto done;
     }
 
     if (input_file == NULL) {
         error_msg("missing argument for -i <HDF5 file>.\n");
         help_ref_msg(stderr);
-        leave (EXIT_FAILURE);
+        h5tools_setstatus(EXIT_FAILURE);
+        goto done;
     }
 
     testval = H5Fis_hdf5 (input_file);
@@ -249,45 +242,49 @@ main (int argc, const char *argv[])
     if (testval <= 0) {
         error_msg("Input HDF5 file \"%s\" is not HDF5 format.\n", input_file);
         help_ref_msg(stderr);
-        leave (EXIT_FAILURE);
+        h5tools_setstatus(EXIT_FAILURE);
+        goto done;
     }
 
     ifile = H5Fopen(input_file, H5F_ACC_RDONLY, H5P_DEFAULT);
 
     if (ifile < 0) {
         error_msg("Can't open input HDF5 file \"%s\"\n", input_file);
-        leave (EXIT_FAILURE);
+        h5tools_setstatus(EXIT_FAILURE);
+        goto done;
     }
 
     plist = H5Fget_create_plist(ifile);
     if (plist < 0) {
         error_msg("Can't get file creation plist for file \"%s\"\n", input_file);
-        H5Fclose(ifile);
-        leave (EXIT_FAILURE);
+        h5tools_setstatus(EXIT_FAILURE);
+        goto done;
     }
 
     status = H5Pget_userblock(plist, &usize);
     if (status < 0) {
         error_msg("Can't get user block for file \"%s\"\n", input_file);
-        H5Pclose(plist);
-        H5Fclose(ifile);
-        leave (EXIT_FAILURE);
+        h5tools_setstatus(EXIT_FAILURE);
+        goto done;
     }
 
     H5Pclose(plist);
+    plist = H5I_INVALID_HID;
     H5Fclose(ifile);
+    ifile = H5I_INVALID_HID;
 
     ufid = HDopen(ub_file, O_RDONLY);
     if(ufid < 0) {
         error_msg("unable to open user block file \"%s\"\n", ub_file);
-        leave (EXIT_FAILURE);
+        h5tools_setstatus(EXIT_FAILURE);
+        goto done;
     }
 
     res = HDfstat(ufid, &sbuf);
     if(res < 0) {
         error_msg("Can't stat file \"%s\"\n", ub_file);
-        HDclose (ufid);
-        leave (EXIT_FAILURE);
+        h5tools_setstatus(EXIT_FAILURE);
+        goto done;
     }
 
     fsize = (off_t)sbuf.st_size;
@@ -295,16 +292,15 @@ main (int argc, const char *argv[])
     h5fid = HDopen(input_file, O_RDONLY);
     if(h5fid < 0) {
         error_msg("unable to open HDF5 file for read \"%s\"\n", input_file);
-        HDclose (ufid);
-        leave (EXIT_FAILURE);
+        h5tools_setstatus(EXIT_FAILURE);
+        goto done;
     }
 
     res = HDfstat(h5fid, &sbuf2);
     if(res < 0) {
         error_msg("Can't stat file \"%s\"\n", input_file);
-        HDclose (h5fid);
-        HDclose (ufid);
-        leave (EXIT_FAILURE);
+        h5tools_setstatus(EXIT_FAILURE);
+        goto done;
     }
 
     h5fsize = (hsize_t)sbuf2.st_size;
@@ -314,9 +310,8 @@ main (int argc, const char *argv[])
 
         if (ofid < 0) {
             error_msg("unable to open output file \"%s\"\n", output_file);
-            HDclose (h5fid);
-            HDclose (ufid);
-            leave (EXIT_FAILURE);
+            h5tools_setstatus(EXIT_FAILURE);
+            goto done;
         }
     }
     else {
@@ -324,9 +319,8 @@ main (int argc, const char *argv[])
 
         if (ofid < 0) {
             error_msg("unable to create output file \"%s\"\n", output_file);
-            HDclose (h5fid);
-            HDclose (ufid);
-            leave (EXIT_FAILURE);
+            h5tools_setstatus(EXIT_FAILURE);
+            goto done;
         }
     }
 
@@ -365,12 +359,11 @@ main (int argc, const char *argv[])
     /* pad the ub */
     if(write_pad(ofid, where, &where) < 0) {
         error_msg("Can't pad file \"%s\"\n", output_file);
-        HDclose (h5fid);
-        HDclose (ufid);
-        HDclose (ofid);
-        leave (EXIT_FAILURE);
+        h5tools_setstatus(EXIT_FAILURE);
+        goto done;
     } /* end if */
 
+done:
     if(ub_file)
         HDfree(ub_file);
     if(input_file)
@@ -378,6 +371,11 @@ main (int argc, const char *argv[])
     if(output_file)
         HDfree(output_file);
 
+    if(plist >= 0)
+        H5Pclose(plist);
+    if(ifile >= 0)
+        H5Fclose(ifile);
+
     if(ufid >= 0)
         HDclose(ufid);
     if(h5fid >= 0)
@@ -385,7 +383,7 @@ main (int argc, const char *argv[])
     if(ofid >= 0)
         HDclose(ofid);
 
-    return h5tools_getstatus();
+    leave(h5tools_getstatus());
 }
 
 /*-------------------------------------------------------------------------
diff --git a/tools/src/h5jam/h5unjam.c b/tools/src/h5jam/h5unjam.c
index 33c5a1b..c6bf498 100644
--- a/tools/src/h5jam/h5unjam.c
+++ b/tools/src/h5jam/h5unjam.c
@@ -185,6 +185,13 @@ done:
     return EXIT_FAILURE;
 }
 
+static void
+leave(int ret)
+{
+   h5tools_close();
+   HDexit(ret);
+}
+
 /*-------------------------------------------------------------------------
  * Function:    main
  *
@@ -197,8 +204,6 @@ done:
 int
 main(int argc, const char *argv[])
 {
-    void               *edata;
-    H5E_auto2_t         func;
     hid_t               ifile = H5I_INVALID_HID;
     hid_t               plist = H5I_INVALID_HID;
     off_t               fsize;
@@ -211,16 +216,15 @@ main(int argc, const char *argv[])
     h5tools_setprogname(PROGRAMNAME);
     h5tools_setstatus(EXIT_SUCCESS);
 
-    /* Disable error reporting  */
-    H5Eget_auto2(H5E_DEFAULT, &func, &edata);
-    H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
-
     /* Initialize h5tools lib  */
     h5tools_init();
 
     if(EXIT_FAILURE == parse_command_line(argc, argv))
         goto done;
 
+    /* enable error reporting if command line option */
+    h5tools_error_report();
+
     if (input_file == NULL) {
         /* no user block  */
         error_msg("missing argument for HDF5 file input.\n");
@@ -319,9 +323,7 @@ done:
         HDfree(ub_file);
     }
 
-    h5tools_close();
-
-    return h5tools_getstatus();
+    leave(h5tools_getstatus());
 }
 
 /*-------------------------------------------------------------------------
diff --git a/tools/src/h5ls/h5ls.c b/tools/src/h5ls/h5ls.c
index 0e0ed33..8be1a11 100644
--- a/tools/src/h5ls/h5ls.c
+++ b/tools/src/h5ls/h5ls.c
@@ -1285,92 +1285,6 @@ print_type(h5tools_str_t *buffer, hid_t type, int ind)
     h5tools_str_append(buffer,"%lu-byte class-%u unknown", (unsigned long)H5Tget_size(type), (unsigned)data_class);
 }
 
-/*
- *
- */
-static void
-dump_reference(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx, hid_t container, hid_t f_type, void *ref_buf, int ndims)
-{
-    hid_t               region_id = H5I_INVALID_HID;
-    hid_t               region_space = H5I_INVALID_HID;
-    size_t              nsize;
-    hsize_t             elmt_counter = 0;  /*counts the # elements printed. */
-    size_t              ncols = 80;        /* available output width        */
-    int                 i;
-    hsize_t             curr_pos = 0;      /* total data element position   */
-    h5tools_str_t       buffer;            /* string into which to render   */
-    h5tools_context_t   datactx;           /* print context  */
-    unsigned char *mem = (unsigned char*) ref_buf;
-
-    H5TOOLS_START_DEBUG("");
-
-    nsize = H5Tget_size(f_type);
-    datactx = *ctx;  /* print context  */
-    /* Assume entire data space to be printed */
-    if (datactx.ndims > 0)
-        for (i = 0; (unsigned)i < datactx.ndims; i++)
-            datactx.p_min_idx[i] = 0;
-    datactx.need_prefix = TRUE;
-
-    HDmemset(&buffer, 0, sizeof(h5tools_str_t));
-    for(i = 0; i < ndims; i++, datactx.cur_elmt++, elmt_counter++) {
-        void* memref = mem + i * nsize;
-
-        H5TOOLS_DEBUG("reference loop:%d with curr_pos=%ld", i, curr_pos);
-
-        datactx.need_prefix = TRUE;
-        h5tools_str_reset(&buffer);
-        H5TOOLS_DEBUG("reference loop - h5tools_str_sprint");
-        h5tools_str_sprint(&buffer, info, container, f_type, memref, &datactx);
-        h5tools_render_element(stream, info, &datactx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)i, (hsize_t)ndims);
-
-        /* region data */
-        if (!h5tools_is_zero(memref, H5Tget_size(f_type))) {
-            if ((region_id = H5Rdereference2(container, H5P_DEFAULT, H5R_DATASET_REGION, memref)) >= 0) {
-                if ((region_space = H5Rget_region(container, H5R_DATASET_REGION, memref)) >= 0) {
-                        H5S_sel_type region_type;
-
-                        region_type = H5Sget_select_type(region_space);
-                        if(region_type == H5S_SEL_POINTS) {
-                            /* Print point information */
-                            H5TOOLS_DEBUG("H5S_SEL_POINTS H5R_DATASET_REGION");
-                            h5tools_dump_region_data_points(
-                                                region_space, region_id, stream, info, &datactx,
-                                                &buffer, &curr_pos, ncols, (hsize_t)i, elmt_counter);
-                        }
-                        else if(region_type == H5S_SEL_HYPERSLABS) {
-                            /* Print block information */
-                            H5TOOLS_DEBUG("H5S_SEL_HYPERSLABS H5R_DATASET_REGION");
-                            h5tools_dump_region_data_blocks(
-                                                region_space, region_id, stream, info, &datactx,
-                                                &buffer, &curr_pos, ncols, (hsize_t)i, elmt_counter);
-                        }
-                        else
-                            H5TOOLS_INFO("invalid region type");
-                    if(H5Sclose(region_space) < 0)
-                        H5TOOLS_INFO("H5Sclose H5R_DATASET_REGION failed");
-                } /* end if (region_space >= 0) */
-                else
-                    H5TOOLS_INFO("H5Rget_region H5R_DATASET_REGION failed");
-                if(H5Dclose(region_id) < 0)
-                    H5TOOLS_INFO("H5Dclose H5R_DATASET_REGION failed");
-            } /* if (region_id >= 0) */
-            else {
-                /* if (region_id < 0) - could mean that no reference was written do not throw failure */
-                H5Epush2(H5tools_ERR_STACK_g, __FILE__, FUNC, __LINE__, H5tools_ERR_CLS_g, H5E_tools_g, H5E_tools_min_id_g, "H5Rdereference failed");
-            }
-        } /* end if (h5tools_is_zero(... */
-
-        H5TOOLS_DEBUG("finished reference loop:%d",i);
-    } /* end for(i = 0; i < ndims; i++, ctx->cur_elmt++, elmt_counter++) */
-
-    h5tools_str_close(&buffer);
-
-    PRINTVALSTREAM(stream, "\n");
-
-    H5TOOLS_ENDDEBUG("");
-}
-
 /*-------------------------------------------------------------------------
  * Function:    dump_dataset_values
  *
@@ -1386,7 +1300,6 @@ dump_dataset_values(hid_t dset)
     hid_t               space = H5I_INVALID_HID;
     hsize_t             total_size[H5S_MAX_RANK];
     int                 ndims;
-    size_t              i;
     size_t              nsize;
     char                string_prefix[64];
     static char         fmt_double[16];
@@ -1411,6 +1324,7 @@ dump_dataset_values(hid_t dset)
     outputformat.line_1st  = NULL;
     outputformat.idx_fmt = "";
     if (simple_output_g) {
+        outputformat.idx_fmt = "";
         outputformat.line_per_line = 1;
         outputformat.line_multi_new = 0;
         outputformat.line_pre  = "        ";
@@ -1503,13 +1417,9 @@ dump_dataset_values(hid_t dset)
         H5TOOLS_DEBUG("ndims=%d - ctx.ndims=%d", ndims, ctx.ndims);
 
         /* Assume entire data space to be printed */
-        if (ctx.ndims > 0)
-            for (i = 0; i < (size_t)ctx.ndims; i++)
-                ctx.p_min_idx[i] = 0;
-
         H5Sget_simple_extent_dims(space, total_size, NULL);
-        if (ctx.ndims > 0)
-            init_acc_pos(&ctx, total_size);
+        init_acc_pos(ctx.ndims, total_size, ctx.acc, ctx.pos, ctx.p_min_idx);
+
         ctx.need_prefix = TRUE;
 
         if (NULL != (region_buf = (void *)HDcalloc(nsize, (size_t)ndims))) {
@@ -1519,7 +1429,9 @@ dump_dataset_values(hid_t dset)
                 H5TOOLS_INFO("H5Dread reference failed");
                 H5TOOLS_GOTO_DONE_NO_RET();
             }
-            dump_reference(rawoutstream, info, &ctx, dset, f_type, region_buf, ndims);
+            h5tools_dump_reference(rawoutstream, info, &ctx, dset, f_type, region_buf, ndims);
+
+            PRINTVALSTREAM(rawoutstream, "\n");
             HDfree(region_buf);
         }
     }
@@ -1557,7 +1469,6 @@ dump_attribute_values(hid_t attr)
     hid_t               space = H5I_INVALID_HID;
     hsize_t             total_size[H5S_MAX_RANK];
     int                 ndims;
-    size_t              i;
     size_t              nsize;
     char                string_prefix[64];
     static char         fmt_double[16];
@@ -1582,6 +1493,7 @@ dump_attribute_values(hid_t attr)
     outputformat.line_1st  = NULL;
     outputformat.idx_fmt = "";
     if (simple_output_g) {
+        outputformat.idx_fmt = "";
         outputformat.line_per_line = 1;
         outputformat.line_multi_new = 0;
         outputformat.line_pre  = "        ";
@@ -1675,13 +1587,9 @@ dump_attribute_values(hid_t attr)
         H5TOOLS_DEBUG("ndims=%d - ctx.ndims=%d", ndims, ctx.ndims);
 
         /* Assume entire data space to be printed */
-        if (ctx.ndims > 0)
-            for (i = 0; i < (size_t)ctx.ndims; i++)
-                ctx.p_min_idx[i] = 0;
-
         H5Sget_simple_extent_dims(space, total_size, NULL);
-        if (ctx.ndims > 0)
-            init_acc_pos(&ctx, total_size);
+        init_acc_pos(ctx.ndims, total_size, ctx.acc, ctx.pos, ctx.p_min_idx);
+
         ctx.need_prefix = TRUE;
 
         if (NULL != (region_buf = (void *)HDcalloc(nsize, (size_t)ndims))) {
@@ -1692,7 +1600,9 @@ dump_attribute_values(hid_t attr)
                 H5TOOLS_GOTO_DONE_NO_RET();
             }
             ctx.indent_level++;
-            dump_reference(rawoutstream, info, &ctx, attr, f_type, region_buf, ndims);
+            h5tools_dump_reference(rawoutstream, info, &ctx, attr, f_type, region_buf, ndims);
+
+            PRINTVALSTREAM(rawoutstream, "\n");
             ctx.indent_level--;
             HDfree(region_buf);
         }
@@ -2188,13 +2098,13 @@ list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void
         h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
     } /* end if */
     else {
-        hid_t obj = H5I_INVALID_HID;               /* ID of object opened */
+        hid_t obj_id = H5I_INVALID_HID;               /* ID of object opened */
 
         /* Open the object.  Not all objects can be opened.  If this is the case
          * then return right away.
          */
         H5TOOLS_DEBUG("Open object name=%s", name);
-        if (obj_type >= 0 && (obj = H5Oopen(iter->fid, name, H5P_DEFAULT)) < 0) {
+        if (obj_type >= 0 && (obj_id = H5Oopen(iter->fid, name, H5P_DEFAULT)) < 0) {
             h5tools_str_reset(&buffer);
             h5tools_str_append(&buffer, " *ERROR*\n");
             h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
@@ -2204,7 +2114,7 @@ list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void
         /* List the first line of information for the object. */
         H5TOOLS_DEBUG("Object type:%d", obj_type);
         if (obj_type >= 0 && dispatch_g[obj_type].list1)
-            (dispatch_g[obj_type].list1)(obj);
+            (dispatch_g[obj_type].list1)(obj_id);
         if (!iter->symlink_target || (verbose_g > 0)) {
             h5tools_str_reset(&buffer);
             h5tools_str_append(&buffer, "\n");
@@ -2221,7 +2131,7 @@ list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void
             /* Display attributes */
             H5TOOLS_DEBUG("Display attributes");
             if (obj_type >= 0)
-                H5Aiterate2(obj, H5_INDEX_NAME, H5_ITER_INC, NULL, list_attr, NULL);
+                H5Aiterate2(obj_id, H5_INDEX_NAME, H5_ITER_INC, NULL, list_attr, NULL);
 
             /* Object location & reference count */
             h5tools_str_reset(&buffer);
@@ -2247,15 +2157,15 @@ list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void
             } /* end if */
 
             /* Object comment */
-            cmt_bufsize = H5Oget_comment(obj, comment, buf_size);
+            cmt_bufsize = H5Oget_comment(obj_id, comment, buf_size);
 
             /* if the actual length of the comment is longer than cmt_bufsize, then call
              * H5Oget_comment again with the correct value.
-             * If the call to H5Oget_comment returned an error, skip this block */
+             */
             if (cmt_bufsize > 0) {
                 comment = (char *)HDmalloc((size_t)cmt_bufsize + 1); /* new_size including null terminator */
                 if (comment) {
-                    cmt_bufsize = H5Oget_comment(obj, comment, (size_t)cmt_bufsize);
+                    cmt_bufsize = H5Oget_comment(obj_id, comment, (size_t)cmt_bufsize);
                     if (cmt_bufsize > 0) {
                         comment[cmt_bufsize] = 0;
                         h5tools_str_reset(&buffer);
@@ -2271,11 +2181,11 @@ list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void
 
         /* Detailed list for object */
         if (obj_type >= 0 && dispatch_g[obj_type].list2)
-            (dispatch_g[obj_type].list2)(obj, name);
+            (dispatch_g[obj_type].list2)(obj_id, name);
 
         /* Close the object. */
         if (obj_type >= 0)
-            H5Oclose(obj);
+            H5Oclose(obj_id);
     } /* end else */
 
 done:
@@ -2682,58 +2592,46 @@ leave(int ret)
 int
 main(int argc, const char *argv[])
 {
-    hid_t       file_id = H5I_INVALID_HID;
-    char       *fname = NULL, *oname = NULL, *x;
-    const char *s = NULL;
-    char       *rest;
-    int         argno;
-    static char root_name[] = "/";
-    char        drivername[50];
-    const char *preferred_driver = NULL;
-    int         err_exit = 0;
-    hid_t       fapl_id = H5P_DEFAULT;
-    H5E_auto2_t         func;
-    H5E_auto2_t         tools_func;
-    void               *edata;
-    void               *tools_edata;
+    hid_t        file_id = H5I_INVALID_HID;
+    char        *fname = NULL, *oname = NULL, *x;
+    const char  *s = NULL;
+    char        *rest;
+    int          argno;
+    static char  root_name[] = "/";
+    char         drivername[50];
+    const char  *preferred_driver = NULL;
+    int          err_exit = 0;
+    hid_t        fapl_id = H5P_DEFAULT;
 
 #ifdef H5_HAVE_ROS3_VFD
-    /* default "anonymous" s3 configuration */
+    /* Default "anonymous" S3 configuration */
     H5FD_ros3_fapl_t ros3_fa = {
-        1,     /* fapl version      */
-        false, /* authenticate      */
-        "",    /* aws region        */
-        "",    /* access key id     */
-        "",    /* secret access key */
+        1,     /* Structure Version */
+        false, /* Authenticate?     */
+        "",    /* AWS Region        */
+        "",    /* Access Key ID     */
+        "",    /* Secret Access Key */
     };
-#endif /* H5_HVAE_ROS3_VFD */
+#endif /* H5_HAVE_ROS3_VFD */
 
 #ifdef H5_HAVE_LIBHDFS
-    /* "default" HDFS configuration */
+    /* "Default" HDFS configuration */
     H5FD_hdfs_fapl_t hdfs_fa = {
-        1,           /* fapl version          */
-        "localhost", /* namenode name         */
-        0,           /* namenode port         */
-        "",          /* kerberos ticket cache */
-        "",          /* user name             */
-        2048,        /* stream buffer size    */
+        1,           /* Structure Version     */
+        "localhost", /* Namenode Name         */
+        0,           /* Namenode Port         */
+        "",          /* Kerberos ticket cache */
+        "",          /* User name             */
+        2048,        /* Stream buffer size    */
     };
 #endif /* H5_HAVE_LIBHDFS */
 
     h5tools_setprogname(PROGRAMNAME);
     h5tools_setstatus(EXIT_SUCCESS);
 
-    /* Disable error reporting */
-    H5Eget_auto2(H5E_DEFAULT, &func, &edata);
-    H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
-
     /* Initialize h5tools lib */
     h5tools_init();
 
-    /* Disable tools error reporting */
-    H5Eget_auto2(H5tools_ERR_STACK_g, &tools_func, &tools_edata);
-    H5Eset_auto2(H5tools_ERR_STACK_g, NULL, NULL);
-
     /* Build object display table */
     DISPATCH(H5O_TYPE_GROUP, "Group", NULL, NULL);
     DISPATCH(H5O_TYPE_DATASET, "Dataset", dataset_list1, dataset_list2);
@@ -2854,18 +2752,9 @@ main(int argc, const char *argv[])
 
         }
         else if (!HDstrncmp(argv[argno], "--s3-cred=", (size_t)10)) {
-#ifndef H5_HAVE_ROS3_VFD
-            HDfprintf(rawerrorstream, "Error: Read-Only S3 VFD is not enabled\n\n");
-            usage();
-            leave(EXIT_FAILURE);
-#else
-            unsigned           nelems     = 0;
-            char              *start      = NULL;
-            char              *s3cred_src = NULL;
-            char             **s3cred     = NULL;
-            char const        *ccred[3];
-            /* try to parse s3 credentials tuple
-             */
+#ifdef H5_HAVE_ROS3_VFD
+            char const *start = NULL;
+
             start = strchr(argv[argno], '=');
             if (start == NULL) {
                 HDfprintf(rawerrorstream, "Error: Unable to parse null credentials tuple\n"
@@ -2874,124 +2763,38 @@ main(int argc, const char *argv[])
                 leave(EXIT_FAILURE);
             }
             start++;
-            if (FAIL == parse_tuple((const char *)start, ',', &s3cred_src, &nelems, &s3cred)) {
-                HDfprintf(rawerrorstream, "Error: Unable to parse S3 credentials\n\n");
-                usage();
-                leave(EXIT_FAILURE);
-            }
-            /* sanity-check tuple count
-             */
-            if (nelems != 3) {
-                HDfprintf(rawerrorstream, "Error: Invalid S3 credentials\n\n");
-                usage();
-                leave(EXIT_FAILURE);
-            }
-            ccred[0] = (const char *)s3cred[0];
-            ccred[1] = (const char *)s3cred[1];
-            ccred[2] = (const char *)s3cred[2];
-            if (0 == h5tools_populate_ros3_fapl(&ros3_fa, ccred)) {
-                HDfprintf(rawerrorstream, "Error: Invalid S3 credentials\n\n");
+
+            if (h5tools_parse_ros3_fapl_tuple(start, ',', &ros3_fa) < 0) {
+                HDfprintf(rawerrorstream, "Error: failed to parse S3 VFD credential info\n\n");
                 usage();
                 leave(EXIT_FAILURE);
             }
-            HDfree(s3cred);
-            HDfree(s3cred_src);
-#endif /* H5_HAVE_ROS3_VFD */
-
+#else
+            HDfprintf(rawerrorstream, "Error: Read-Only S3 VFD is not enabled\n\n");
+            usage();
+            leave(EXIT_FAILURE);
+#endif
         }
         else if (!HDstrncmp(argv[argno], "--hdfs-attrs=", (size_t)13)) {
-#ifndef H5_HAVE_LIBHDFS
-            PRINTVALSTREAM(rawoutstream, "The HDFS VFD is not enabled.\n");
-            leave(EXIT_FAILURE);
-#else
-            /* Parse received configuration data and set fapl config struct */
-
-            hbool_t            _debug    = FALSE;
-            unsigned           nelems    = 0;
-            char const        *start     = NULL;
-            char              *props_src = NULL;
-            char             **props     = NULL;
-            unsigned long      k         = 0;
+#ifdef H5_HAVE_LIBHDFS
+            char const *start = NULL;
 
-            /* try to parse tuple
-             */
-            if (_debug) {
-                HDfprintf(stderr, "configuring hdfs...\n");
-            }
             start = argv[argno]+13; /* should never segfault: worst case of */
             if (*start != '(') {    /* null-termintor after '='.            */
-
-                if (_debug) {
-                    HDfprintf(stderr, "    no tuple.\n");
-                }
-                usage();
-                leave(EXIT_FAILURE);
-            }
-            if (FAIL == parse_tuple((const char *)start, ',', &props_src, &nelems, &props)) {
-                HDfprintf(stderr, "    unable to parse tuple.\n");
                 usage();
                 leave(EXIT_FAILURE);
             }
 
-            /* sanity-check tuple count
-             */
-            if (nelems != 5) {
-                HDfprintf(stderr, "    expected 5-ple, got `%d`\n", nelems);
+            if (h5tools_parse_hdfs_fapl_tuple(start, ',', &hdfs_fa) < 0) {
+                HDfprintf(rawerrorstream, "Error: failed to parse HDFS VFD configuration info\n\n");
                 usage();
                 leave(EXIT_FAILURE);
             }
-            if (_debug) {
-                HDfprintf(stderr, "    got hdfs-attrs tuple: `(%s,%s,%s,%s,%s)`\n", props[0], props[1], props[2], props[3], props[4]);
-            }
-
-            /* Populate fapl configuration structure with given properties.
-             * WARNING: No error-checking is done on length of input strings...
-             *          Silent overflow is possible, albeit unlikely.
-             */
-            if (HDstrncmp(props[0], "", 1)) {
-                if (_debug) {
-                    HDfprintf(stderr, "    setting namenode name: %s\n", props[0]);
-                }
-                HDstrncpy(hdfs_fa.namenode_name, (const char *)props[0], HDstrlen(props[0]));
-            }
-            if (HDstrncmp(props[1], "", 1)) {
-                k = strtoul((const char *)props[1], NULL, 0);
-                if (errno == ERANGE) {
-                    HDfprintf(stderr, "    supposed port number wasn't.\n");
-                    leave(EXIT_FAILURE);
-                }
-                if (_debug) {
-                    HDfprintf(stderr, "    setting namenode port: %lu\n", k);
-                }
-                hdfs_fa.namenode_port = (int32_t)k;
-            }
-            if (HDstrncmp(props[2], "", 1)) {
-                if (_debug) {
-                    HDfprintf(stderr, "    setting kerb cache path: %s\n", props[2]);
-                }
-                HDstrncpy(hdfs_fa.kerberos_ticket_cache, (const char *)props[2], HDstrlen(props[2]));
-            }
-            if (HDstrncmp(props[3], "", 1)) {
-                if (_debug) {
-                    HDfprintf(stderr, "    setting username: %s\n", props[3]);
-                }
-                HDstrncpy(hdfs_fa.user_name, (const char *)props[3], HDstrlen(props[3]));
-            }
-            if (HDstrncmp(props[4], "", 1)) {
-                k = HDstrtoul((const char *)props[4], NULL, 0);
-                if (errno == ERANGE) {
-                    HDfprintf(stderr, "    supposed buffersize number wasn't.\n");
-                    leave(EXIT_FAILURE);
-                }
-                if (_debug) {
-                    HDfprintf(stderr, "    setting stream buffer size: %lu\n", k);
-                }
-                hdfs_fa.stream_buffer_size = (int32_t)k;
-            }
-            HDfree(props);
-            HDfree(props_src);
-#endif /* H5_HAVE_LIBHDFS */
-
+#else
+            HDfprintf(rawerrorstream, "Error: The HDFS VFD is not enabled\n\n");
+            usage();
+            leave(EXIT_FAILURE);
+#endif
         }
         else if('-'!=argv[argno][1]) {
             /* Single-letter switches */
@@ -3071,6 +2874,9 @@ main(int argc, const char *argv[])
         }
     } /* end for */
 
+    /* enable error reporting if command line option */
+    h5tools_error_report();
+
     /* If no arguments remain then print a usage message (instead of doing
      * absolutely nothing ;-) */
     if (argno >= argc) {
@@ -3085,45 +2891,32 @@ main(int argc, const char *argv[])
     }
 
     if (preferred_driver) {
-        void *conf_fa = NULL;
+        h5tools_vfd_info_t vfd_info;
 
-        if (!HDstrcmp(preferred_driver, "ros3")) {
-#ifndef H5_HAVE_ROS3_VFD
-            HDfprintf(rawerrorstream, "Error: Read-Only S3 VFD not enabled.\n\n");
-            usage();
-            leave(EXIT_FAILURE);
-#else
-            conf_fa = (void *)&ros3_fa;
-#endif /* H5_HAVE_ROS3_VFD */
+        vfd_info.info       = NULL;
+        vfd_info.name       = preferred_driver;
 
-        }
-        else if (!HDstrcmp(preferred_driver, "hdfs")) {
-#ifndef H5_HAVE_LIBHDFS
-            PRINTVALSTREAM(rawoutstream, "The HDFS VFD is not enabled.\n");
+        if (!HDstrcmp(preferred_driver, drivernames[ROS3_VFD_IDX])) {
+#ifdef H5_HAVE_ROS3_VFD
+            vfd_info.info = (void *)&ros3_fa;
+#else
+            HDfprintf(rawerrorstream, "Error: Read-Only S3 VFD is not enabled\n\n");
             leave(EXIT_FAILURE);
+#endif
+        }
+        else if (!HDstrcmp(preferred_driver, drivernames[HDFS_VFD_IDX])) {
+#ifdef H5_HAVE_LIBHDFS
+            vfd_info.info = (void *)&hdfs_fa;
 #else
-            conf_fa = (void *)&hdfs_fa;
-#endif /* H5_HAVE_LIBHDFS */
+            HDfprintf(rawerrorstream, "Error: The HDFS VFD is not enabled\n\n");
+            leave(EXIT_FAILURE);
+#endif
         }
 
-        if (conf_fa != NULL) {
-            HDassert(fapl_id == H5P_DEFAULT);
-            fapl_id = H5Pcreate(H5P_FILE_ACCESS);
-            if (fapl_id < 0) {
-                HDfprintf(rawerrorstream, "Error: Unable to create fapl entry\n\n");
-                leave(EXIT_FAILURE);
-            }
-            if (0 == h5tools_set_configured_fapl(fapl_id, preferred_driver, conf_fa)) {
-                HDfprintf(rawerrorstream, "Error: Unable to set fapl\n\n");
-                usage();
-                leave(EXIT_FAILURE);
-            }
+        if ((fapl_id = h5tools_get_fapl(H5P_DEFAULT, &vfd_info)) < 0) {
+            HDfprintf(rawerrorstream, "Error: Unable to create FAPL for file access\n\n");
+            leave(EXIT_FAILURE);
         }
-    } /* preferred_driver defined */
-
-    if (enable_error_stack > 0) {
-        H5Eset_auto2(H5E_DEFAULT, func, edata);
-        H5Eset_auto2(H5tools_ERR_STACK_g, tools_func, tools_edata);
     }
 
     /* Each remaining argument is an hdf5 file followed by an optional slash
@@ -3150,12 +2943,8 @@ main(int argc, const char *argv[])
         file_id = H5I_INVALID_HID;
 
         while (fname && *fname) {
-            if (fapl_id != H5P_DEFAULT) {
-                file_id = H5Fopen(fname, H5F_ACC_RDONLY, fapl_id);
-            }
-            else {
-                file_id = h5tools_fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT, preferred_driver, drivername, sizeof drivername);
-            }
+            file_id = h5tools_fopen(fname, H5F_ACC_RDONLY, fapl_id,
+                    (fapl_id == H5P_DEFAULT) ? FALSE : TRUE, drivername, sizeof drivername);
 
             if (file_id >= 0) {
                 if (verbose_g)
@@ -3188,7 +2977,6 @@ main(int argc, const char *argv[])
             x = oname;
             if (NULL == (oname = HDstrdup(oname))) {
                 HDfprintf(rawerrorstream, "memory allocation failed\n");
-                H5Eset_auto2(H5E_DEFAULT, func, edata);
                 leave(EXIT_FAILURE);
             }
             *x = '\0';
@@ -3233,7 +3021,6 @@ main(int argc, const char *argv[])
                 h5tools_str_reset(&buffer);
                 print_obj_name(&buffer, &iter, oname, "**NOT FOUND**");
                 h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
-                H5Eset_auto2(H5E_DEFAULT, func, edata);
                 leave(EXIT_FAILURE);
             } /* end if */
         } /* end if */
@@ -3243,7 +3030,6 @@ main(int argc, const char *argv[])
         /* Open the object and display it's information */
         if (li.type == H5L_TYPE_HARD) {
             if (visit_obj(file_id, oname, &iter) < 0) {
-                H5Eset_auto2(H5E_DEFAULT, func, edata);
                 leave(EXIT_FAILURE);
             }
         } /* end if(li.type == H5L_TYPE_HARD) */
@@ -3274,12 +3060,10 @@ main(int argc, const char *argv[])
     if (fapl_id != H5P_DEFAULT) {
         if (0 < H5Pclose(fapl_id)) {
             HDfprintf(rawerrorstream, "Error: Unable to set close fapl entry\n\n");
-            H5Eset_auto2(H5E_DEFAULT, func, edata);
             leave(EXIT_FAILURE);
         }
     }
 
-    H5Eset_auto2(H5E_DEFAULT, func, edata);
     if (err_exit)
         leave(EXIT_FAILURE);
     else
diff --git a/tools/src/h5repack/h5repack.c b/tools/src/h5repack/h5repack.c
index d17d465..9347eff 100644
--- a/tools/src/h5repack/h5repack.c
+++ b/tools/src/h5repack/h5repack.c
@@ -79,6 +79,8 @@ h5repack_init(pack_opt_t *options, int verbose, hbool_t latest)
     options->layout_g = H5D_LAYOUT_ERROR;
     options->low_bound = H5F_LIBVER_EARLIEST;
     options->high_bound = H5F_LIBVER_LATEST;
+    options->fin_fapl = H5P_DEFAULT;
+    options->fout_fapl = H5P_DEFAULT;
 
     for (n = 0; n < H5_REPACK_MAX_NFILTERS; n++) {
         options->filter_g[n].filtn = -1;
@@ -739,7 +741,8 @@ check_objects(const char* fname, pack_opt_t *options)
      * open the file
      *-------------------------------------------------------------------------
      */
-    if ((fid = h5tools_fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, 0)) < 0)
+    if ((fid = h5tools_fopen(fname, H5F_ACC_RDONLY, options->fin_fapl,
+            (options->fin_fapl == H5P_DEFAULT) ? FALSE : TRUE, NULL, 0)) < 0)
         H5TOOLS_GOTO_ERROR((-1), "h5tools_fopen failed <%s>: %s", fname, H5FOPENERROR);
 
     /*-------------------------------------------------------------------------
diff --git a/tools/src/h5repack/h5repack.h b/tools/src/h5repack/h5repack.h
index a0e0387..1f0dd8c 100644
--- a/tools/src/h5repack/h5repack.h
+++ b/tools/src/h5repack/h5repack.h
@@ -114,6 +114,8 @@ typedef struct {
     hbool_t         latest;         /*pack file with the latest file format */
     H5F_libver_t    low_bound;      /* The file's low bound as in H5Fset_libver_bounds() */
     H5F_libver_t    high_bound;     /* The file's high bound as in H5Fset_libver_bounds() */
+    hid_t           fin_fapl;       /* FAPL to use for opening the input file */
+    hid_t           fout_fapl;      /* FAPL to use for opening/creating the output file */
     int             grp_compact;    /* Set the maximum number of links to store as header messages in the group */
     int             grp_indexed;    /* Set the minimum number of links to store in the indexed format */
     int             msg_size[8];    /* Minimum size of shared messages: dataspace,
@@ -151,7 +153,7 @@ int h5repack_addlayout(const char* str, pack_opt_t *options);
 int h5repack_init(pack_opt_t *options, int verbose, hbool_t latest);
 int h5repack_end(pack_opt_t *options);
 int h5repack_verify(const char *in_fname, const char *out_fname, pack_opt_t *options);
-int h5repack_cmp_pl(const char *fname1, const char *fname2);
+int h5repack_cmp_pl(const char *fname1, hid_t fname1_fapl, const char *fname2, hid_t fname2_fapl);
 
 /* Note: The below copy_named_datatype(), named_datatype_free(), copy_attr()
  * and struct named_dt_t were located in h5repack_copy.c as static prior to
diff --git a/tools/src/h5repack/h5repack_copy.c b/tools/src/h5repack/h5repack_copy.c
index eb6f5c6..c3017f4 100644
--- a/tools/src/h5repack/h5repack_copy.c
+++ b/tools/src/h5repack/h5repack_copy.c
@@ -67,7 +67,6 @@ copy_objects(const char* fnamein, const char* fnameout, pack_opt_t *options)
     hid_t         grp_in = H5I_INVALID_HID;   /* group ID */
     hid_t         gcpl_in = H5I_INVALID_HID;  /* group creation property list */
     hid_t         fcpl = H5P_DEFAULT;     /* file creation property list ID */
-    hid_t         fapl = H5P_DEFAULT;     /* file access property list ID */
     trav_table_t *travt = NULL;
     hsize_t       ub_size = 0;            /* size of user block */
     H5F_fspace_strategy_t set_strategy;   /* Strategy to be set in outupt file */
@@ -85,7 +84,8 @@ copy_objects(const char* fnamein, const char* fnameout, pack_opt_t *options)
      * open input file
      *-------------------------------------------------------------------------
      */
-    if ((fidin = h5tools_fopen(fnamein, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, (size_t) 0)) < 0)
+    if ((fidin = h5tools_fopen(fnamein, H5F_ACC_RDONLY, options->fin_fapl,
+            (options->fin_fapl == H5P_DEFAULT) ? FALSE : TRUE, NULL, (size_t) 0)) < 0)
         H5TOOLS_GOTO_ERROR((-1), "h5tools_fopen failed <%s>: %s", fnamein, H5FOPENERROR);
 
     /* get user block size and file space strategy/persist/threshold */
@@ -122,12 +122,14 @@ copy_objects(const char* fnamein, const char* fnameout, pack_opt_t *options)
 
     if(options->latest)
         options->low_bound = options->high_bound = H5F_LIBVER_LATEST;
+
     /* Create file access property list */
-    if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
-        H5TOOLS_GOTO_ERROR((-1), "H5Pcreate failed to create file access property list");
+    if (options->fout_fapl == H5P_DEFAULT)
+        if ((options->fout_fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
+            H5TOOLS_GOTO_ERROR((-1), "H5Pcreate failed to create file access property list");
 
     /* It can be default, latest or other settings by users */
-    if(H5Pset_libver_bounds(fapl, options->low_bound, options->high_bound) < 0)
+    if(H5Pset_libver_bounds(options->fout_fapl, options->low_bound, options->high_bound) < 0)
         H5TOOLS_GOTO_ERROR((-1), "H5Pset_libver_bounds failed to set format version bounds");
 
     /* Check if we need to create a non-default file creation property list */
@@ -218,12 +220,12 @@ print_user_block(fnamein, fidin);
      */
     if (options->alignment > 0) {
         /* either use the FAPL already created or create a new one */
-        if (fapl == H5P_DEFAULT)
+        if (options->fout_fapl == H5P_DEFAULT)
             /* create a file access property list */
-            if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
+            if ((options->fout_fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
                 H5TOOLS_GOTO_ERROR((-1), "H5Pcreate failed to create file access property list");
 
-        if (H5Pset_alignment(fapl, options->threshold, options->alignment) < 0)
+        if (H5Pset_alignment(options->fout_fapl, options->threshold, options->alignment) < 0)
             H5TOOLS_GOTO_ERROR((-1), "H5Pset_alignment failed to set alignment");
     }
 
@@ -233,12 +235,12 @@ print_user_block(fnamein, fidin);
      */
     if (options->meta_block_size > 0) {
         /* either use the FAPL already created or create a new one */
-        if (fapl == H5P_DEFAULT)
+        if (options->fout_fapl == H5P_DEFAULT)
             /* create a file access property list */
-            if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
+            if ((options->fout_fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
                 H5TOOLS_GOTO_ERROR((-1), "H5Pcreate failed to create file access property list");
 
-        if (H5Pset_meta_block_size(fapl, options->meta_block_size) < 0)
+        if (H5Pset_meta_block_size(options->fout_fapl, options->meta_block_size) < 0)
             H5TOOLS_GOTO_ERROR((-1), "H5Pset_meta_block_size failed to set metadata block size");
     }
 
@@ -297,7 +299,7 @@ print_user_block(fnamein, fidin);
     if (options->verbose)
         HDprintf("Making new file ...\n");
 
-    if ((fidout = H5Fcreate(fnameout, H5F_ACC_TRUNC, fcpl, fapl)) < 0)
+    if ((fidout = H5Fcreate(fnameout, H5F_ACC_TRUNC, fcpl, options->fout_fapl)) < 0)
         H5TOOLS_GOTO_ERROR((-1), "H5Fcreate could not create file <%s>:", fnameout);
 
     /*-------------------------------------------------------------------------
@@ -352,7 +354,6 @@ done:
     H5E_BEGIN_TRY {
         H5Pclose(fcpl_in);
         H5Pclose(gcpl_in);
-        H5Pclose(fapl);
         H5Pclose(fcpl);
         H5Gclose(grp_in);
         H5Fclose(fidin);
diff --git a/tools/src/h5repack/h5repack_main.c b/tools/src/h5repack/h5repack_main.c
index 0822b16..793c689 100644
--- a/tools/src/h5repack/h5repack_main.c
+++ b/tools/src/h5repack/h5repack_main.c
@@ -633,7 +633,7 @@ int parse_command_line(int argc, const char **argv, pack_opt_t* options)
 
             case 'q':
                 if (H5_INDEX_UNKNOWN == (sort_by = set_sort_by(opt_arg))) {
-                    error_msg(" failed to set sort by form <%s>\n", opt_arg);
+                    error_msg("failed to set sort by form <%s>\n", opt_arg);
                     h5tools_setstatus(EXIT_FAILURE);
                     ret_value = -1;
                     goto done;
@@ -642,7 +642,7 @@ int parse_command_line(int argc, const char **argv, pack_opt_t* options)
 
             case 'z':
                 if (H5_ITER_UNKNOWN == (sort_order = set_sort_order(opt_arg))) {
-                    error_msg(" failed to set sort order form <%s>\n", opt_arg);
+                    error_msg("failed to set sort order form <%s>\n", opt_arg);
                     h5tools_setstatus(EXIT_FAILURE);
                     ret_value = -1;
                     goto done;
@@ -660,30 +660,30 @@ int parse_command_line(int argc, const char **argv, pack_opt_t* options)
 
     /* If neither -i nor -o given, get in and out files positionally */
     if (0 == (has_i + has_o)) {
-         if (argv[opt_ind] != NULL && argv[opt_ind + 1] != NULL) {
-             infile = argv[opt_ind];
-             outfile = argv[opt_ind + 1];
-
-             if (!HDstrcmp(infile, outfile)) {
-                 error_msg("file names cannot be the same\n");
-                 usage(h5tools_getprogname());
-                 h5tools_setstatus(EXIT_FAILURE);
-                 ret_value = -1;
-             }
-         }
-         else {
-             error_msg("file names missing\n");
-             usage(h5tools_getprogname());
-             h5tools_setstatus(EXIT_FAILURE);
-             ret_value = -1;
-         }
-     }
-     else if (has_i != 1 || has_o != 1) {
-         error_msg("filenames must be either both -i -o or both positional\n");
-         usage(h5tools_getprogname());
-         h5tools_setstatus(EXIT_FAILURE);
-         ret_value = -1;
-     }
+        if (argv[opt_ind] != NULL && argv[opt_ind + 1] != NULL) {
+            infile = argv[opt_ind];
+            outfile = argv[opt_ind + 1];
+
+            if (!HDstrcmp(infile, outfile)) {
+                error_msg("file names cannot be the same\n");
+                usage(h5tools_getprogname());
+                h5tools_setstatus(EXIT_FAILURE);
+                ret_value = -1;
+            }
+        }
+        else {
+            error_msg("file names missing\n");
+            usage(h5tools_getprogname());
+            h5tools_setstatus(EXIT_FAILURE);
+            ret_value = -1;
+        }
+    }
+    else if (has_i != 1 || has_o != 1) {
+        error_msg("filenames must be either both -i -o or both positional\n");
+        usage(h5tools_getprogname());
+        h5tools_setstatus(EXIT_FAILURE);
+        ret_value = -1;
+    }
 
 done:
     return ret_value;
@@ -702,27 +702,15 @@ done:
 int main(int argc, const char **argv)
 {
     pack_opt_t          options; /*the global options */
-    H5E_auto2_t         func;
-    H5E_auto2_t         tools_func;
-    void               *edata;
-    void               *tools_edata;
     int                 parse_ret;
 
     HDmemset(&options, 0, sizeof(pack_opt_t));
 
-    h5tools_setprogname(PROGRAMNAME);
-    h5tools_setstatus(EXIT_SUCCESS);
-
-    /* Disable error reporting */
-    H5Eget_auto2(H5E_DEFAULT, &func, &edata);
-    H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
-
     /* Initialize h5tools lib */
     h5tools_init();
 
-    /* Disable tools error reporting */
-    H5Eget_auto2(H5tools_ERR_STACK_g, &tools_func, &tools_edata);
-    H5Eset_auto2(H5tools_ERR_STACK_g, NULL, NULL);
+    h5tools_setprogname(PROGRAMNAME);
+    h5tools_setstatus(EXIT_SUCCESS);
 
     /* update hyperslab buffer size from H5TOOLS_BUFSIZE env if exist */
     if (h5tools_getenv_update_hyperslab_bufsize() < 0) {
@@ -753,10 +741,8 @@ int main(int argc, const char **argv)
         goto done;
     }
 
-    if (enable_error_stack > 0) {
-        H5Eset_auto2(H5E_DEFAULT, func, edata);
-        H5Eset_auto2(H5tools_ERR_STACK_g, tools_func, tools_edata);
-    }
+    /* enable error reporting if command line option */
+    h5tools_error_report();
 
     /* pack it */
     if (h5repack(infile, outfile, &options) < 0) {
@@ -768,6 +754,11 @@ int main(int argc, const char **argv)
     h5tools_setstatus(EXIT_SUCCESS);
 
 done:
+    if (options.fin_fapl >= 0 && options.fin_fapl != H5P_DEFAULT)
+        H5Pclose(options.fin_fapl);
+    if (options.fout_fapl >= 0 && options.fout_fapl != H5P_DEFAULT)
+        H5Pclose(options.fout_fapl);
+
     /* free tables */
     h5repack_end(&options);
 
diff --git a/tools/src/h5repack/h5repack_refs.c b/tools/src/h5repack/h5repack_refs.c
index 04aea57..ee17ed8 100644
--- a/tools/src/h5repack/h5repack_refs.c
+++ b/tools/src/h5repack/h5repack_refs.c
@@ -171,10 +171,9 @@ int do_copy_refobjs(hid_t fidin,
                             } /* end if */
                             for(u = 0; u < nelmts; u++) {
                                 H5E_BEGIN_TRY {
-                                    refobj_id = H5Rdereference2(dset_in, H5P_DEFAULT, H5R_OBJECT, &buf[u]);
+                                    if((refobj_id = H5Rdereference2(dset_in, H5P_DEFAULT, H5R_OBJECT, &buf[u])) < 0)
+                                        continue;
                                 } H5E_END_TRY;
-                                if(refobj_id < 0)
-                                    continue;
 
                                 /* get the name. a valid name could only occur
                                  * in the second traversal of the file
@@ -253,10 +252,9 @@ int do_copy_refobjs(hid_t fidin,
 
                             for(u = 0; u < nelmts; u++) {
                                 H5E_BEGIN_TRY {
-                                    refobj_id = H5Rdereference2(dset_in, H5P_DEFAULT, H5R_DATASET_REGION, &buf[u]);
+                                    if((refobj_id = H5Rdereference2(dset_in, H5P_DEFAULT, H5R_DATASET_REGION, &buf[u])) < 0)
+                                        continue;
                                 } H5E_END_TRY;
-                                if(refobj_id < 0)
-                                    continue;
 
                                 /* get the name. a valid name could only occur
                                  * in the second traversal of the file
@@ -456,7 +454,6 @@ static int copy_refs_attr(hid_t loc_in,
     int         ref_comp_field_n = 0;
     int         ret_value = 0;
 
-
     if(H5Oget_info2(loc_in, &oinfo, H5O_INFO_NUM_ATTRS) < 0)
         H5TOOLS_GOTO_ERROR((-1), "H5Oget_info failed");
 
diff --git a/tools/src/h5repack/h5repack_verify.c b/tools/src/h5repack/h5repack_verify.c
index 48de8d7..76adc16 100644
--- a/tools/src/h5repack/h5repack_verify.c
+++ b/tools/src/h5repack/h5repack_verify.c
@@ -353,16 +353,16 @@ int verify_layout(hid_t pid, pack_info_t *obj)
  *-------------------------------------------------------------------------
  */
 
-int h5repack_cmp_pl(const char *fname1, const char *fname2)
+int h5repack_cmp_pl(const char *fname1, hid_t fname1_fapl, const char *fname2, hid_t fname2_fapl)
 {
-    hid_t         fid1 =H5I_INVALID_HID;         /* file ID */
-    hid_t         fid2 =H5I_INVALID_HID;         /* file ID */
-    hid_t         dset1 =H5I_INVALID_HID;        /* dataset ID */
-    hid_t         dset2 =H5I_INVALID_HID;        /* dataset ID */
-    hid_t         gid =H5I_INVALID_HID;          /* group ID */
-    hid_t         dcpl1 =H5I_INVALID_HID;        /* dataset creation property list ID */
-    hid_t         dcpl2 =H5I_INVALID_HID;        /* dataset creation property list ID */
-    hid_t         gcplid =H5I_INVALID_HID;       /* group creation property list */
+    hid_t         fid1 = H5I_INVALID_HID;         /* file ID */
+    hid_t         fid2 = H5I_INVALID_HID;         /* file ID */
+    hid_t         dset1 = H5I_INVALID_HID;        /* dataset ID */
+    hid_t         dset2 = H5I_INVALID_HID;        /* dataset ID */
+    hid_t         gid = H5I_INVALID_HID;          /* group ID */
+    hid_t         dcpl1 = H5I_INVALID_HID;        /* dataset creation property list ID */
+    hid_t         dcpl2 = H5I_INVALID_HID;        /* dataset creation property list ID */
+    hid_t         gcplid = H5I_INVALID_HID;       /* group creation property list */
     unsigned      crt_order_flag1;  /* group creation order flag */
     unsigned      crt_order_flag2;  /* group creation order flag */
     trav_table_t *trav = NULL;
@@ -374,9 +374,9 @@ int h5repack_cmp_pl(const char *fname1, const char *fname2)
     *-------------------------------------------------------------------------
     */
     /* Open the files */
-    if ((fid1 = H5Fopen(fname1, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+    if ((fid1 = h5tools_fopen(fname1, H5F_ACC_RDONLY, fname1_fapl, TRUE, NULL, 0)) < 0)
         H5TOOLS_GOTO_ERROR((-1), "h5tools_fopen failed <%s>: %s", fname1, H5FOPENERROR);
-    if ((fid2 = H5Fopen(fname2, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+    if ((fid2 = h5tools_fopen(fname2, H5F_ACC_RDONLY, fname2_fapl, TRUE, NULL, 0)) < 0)
         H5TOOLS_GOTO_ERROR((-1), "h5tools_fopen failed <%s>: %s", fname2, H5FOPENERROR);
 
    /*-------------------------------------------------------------------------
diff --git a/tools/src/h5stat/h5stat.c b/tools/src/h5stat/h5stat.c
index 9bb81b5..f4fdae6 100644
--- a/tools/src/h5stat/h5stat.c
+++ b/tools/src/h5stat/h5stat.c
@@ -118,30 +118,28 @@ typedef struct iter_t {
 } iter_t;
 
 
-static const char *drivername = "";
+static const char *drivername = NULL;
 
 #ifdef H5_HAVE_ROS3_VFD
-/* default "anonymous" s3 configuration
- */
+/* Default "anonymous" S3 configuration */
 static H5FD_ros3_fapl_t ros3_fa = {
-    1,     /* fapl version      */
-    false, /* authenticate      */
-    "",    /* aws region        */
-    "",    /* access key id     */
-    "",    /* secret access key */
+    1,     /* Structure Version */
+    false, /* Authenticate?     */
+    "",    /* AWS Region        */
+    "",    /* Access Key ID     */
+    "",    /* Secret Access Key */
 };
 #endif /* H5_HAVE_ROS3_VFD */
 
 #ifdef H5_HAVE_LIBHDFS
-/* default HDFS access configuration
- */
+/* "Default" HDFS configuration */
 static H5FD_hdfs_fapl_t hdfs_fa = {
-    1,           /* fapl version          */
-    "localhost", /* namenode name         */
-    0,           /* namenode port         */
-    "",          /* kerberos ticket cache */
-    "",          /* user name             */
-    2048,        /* stream buffer size    */
+    1,           /* Structure Version     */
+    "localhost", /* Namenode Name         */
+    0,           /* Namenode Port         */
+    "",          /* Kerberos ticket cache */
+    "",          /* User name             */
+    2048,        /* Stream buffer size    */
 };
 #endif /* H5_HAVE_LIBHDFS */
 
@@ -1059,103 +1057,32 @@ parse_command_line(int argc, const char *argv[], struct handler_t **hand_ret)
                 break;
 
             case 'w':
-#ifndef H5_HAVE_ROS3_VFD
+#ifdef H5_HAVE_ROS3_VFD
+                if (h5tools_parse_ros3_fapl_tuple(opt_arg, ',', &ros3_fa) < 0) {
+                    error_msg("failed to parse S3 VFD credential info\n");
+                    goto error;
+                }
+
+                drivername = drivernames[ROS3_VFD_IDX];
+#else
                 error_msg("Read-Only S3 VFD not enabled.\n");
                 goto error;
-#else
-                {
-                    char        *cred_str = NULL;
-                    unsigned     nelems   = 0;
-                    char       **cred     = NULL;
-                    char const  *ccred[3];
-
-                    if (FAIL == parse_tuple((const char *)opt_arg, ',', &cred_str, &nelems, &cred)) {
-                        error_msg("Unable to parse s3 credential\n");
-                        goto error;
-                    }
-                    if (nelems != 3) {
-                        error_msg("s3 credential must have three elements\n");
-                        goto error;
-                    }
-                    ccred[0] = (const char *)cred[0];
-                    ccred[1] = (const char *)cred[1];
-                    ccred[2] = (const char *)cred[2];
-                    if (0 == h5tools_populate_ros3_fapl(&ros3_fa, ccred)) {
-                        error_msg("Unable to set ros3 fapl config\n");
-                        goto error;
-                    }
-                    HDfree(cred);
-                    HDfree(cred_str);
-                } /* parse s3-cred block */
-                drivername = "ros3";
+#endif
                 break;
-#endif /* H5_HAVE_ROS3_VFD */
 
             case 'H':
-#ifndef H5_HAVE_LIBHDFS
-                error_msg("HDFS VFD is not enabled.\n");
-                goto error;
-#else
-                {
-                    unsigned         nelems    = 0;
-                    char            *props_src = NULL;
-                    char           **props     = NULL;
-                    unsigned long    k         = 0;
-                    if (FAIL == parse_tuple((const char *)opt_arg,
-                            ',', &props_src, &nelems, &props)) {
-                        error_msg("unable to parse hdfs properties tuple\n");
-                        goto error;
-                    }
-                    /* sanity-check tuple count
-                     */
-                    if (nelems != 5) {
-                        char str[64] = "";
-                        HDsprintf(str,
-                                "expected 5 elements in hdfs properties tuple "
-                                "but found %u\n",
-                                nelems);
-                        HDfree(props);
-                        HDfree(props_src);
-                        error_msg(str);
-                        goto error;
-                    }
-                    /* Populate fapl configuration structure with given
-                     * properties.
-                     * TODO/WARNING: No error-checking is done on length of
-                     *         input strings... Silent overflow is possible,
-                     *         albeit unlikely.
-                     */
-                    if (HDstrncmp(props[0], "", 1)) {
-                        HDstrncpy(hdfs_fa.namenode_name,(const char *)props[0], HDstrlen(props[0]));
-                    }
-                    if (HDstrncmp(props[1], "", 1)) {
-                        k = strtoul((const char *)props[1], NULL, 0);
-                        if (errno == ERANGE) {
-                            error_msg("supposed port number wasn't.\n");
-                            goto error;
-                        }
-                        hdfs_fa.namenode_port = (int32_t)k;
-                    }
-                    if (HDstrncmp(props[2], "", 1)) {
-                        HDstrncpy(hdfs_fa.kerberos_ticket_cache, (const char *)props[2], HDstrlen(props[2]));
-                    }
-                    if (HDstrncmp(props[3], "", 1)) {
-                        HDstrncpy(hdfs_fa.user_name, (const char *)props[3], HDstrlen(props[3]));
-                    }
-                    if (strncmp(props[4], "", 1)) {
-                        k = HDstrtoul((const char *)props[4], NULL, 0);
-                        if (errno == ERANGE) {
-                            error_msg("supposed buffersize number wasn't.\n");
-                            goto error;
-                        }
-                        hdfs_fa.stream_buffer_size = (int32_t)k;
-                    }
-                    HDfree(props);
-                    HDfree(props_src);
-                    drivername = "hdfs";
+#ifdef H5_HAVE_LIBHDFS
+                if (h5tools_parse_hdfs_fapl_tuple(opt_arg, ',', &hdfs_fa) < 0) {
+                    error_msg("failed to parse HDFS VFD configuration info\n");
+                    goto error;
                 }
+
+                drivername = drivernames[HDFS_VFD_IDX];
+#else
+                error_msg("HDFS VFD not enabled.\n");
+                goto error;
+#endif
                 break;
-#endif /* H5_HAVE_LIBHDFS */
 
             default:
                 usage(h5tools_getprogname());
@@ -1853,75 +1780,54 @@ main(int argc, const char *argv[])
     iter_t              iter;
     const char         *fname = NULL;
     hid_t               fid = H5I_INVALID_HID;
-    H5E_auto2_t         func;
-    H5E_auto2_t         tools_func;
-    void               *edata;
-    void               *tools_edata;
     struct handler_t   *hand = NULL;
     hid_t               fapl_id = H5P_DEFAULT;
 
     h5tools_setprogname(PROGRAMNAME);
     h5tools_setstatus(EXIT_SUCCESS);
 
-    /* Disable error reporting */
-    H5Eget_auto2(H5E_DEFAULT, &func, &edata);
-    H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
-
     /* Initialize h5tools lib */
     h5tools_init();
 
-    /* Disable tools error reporting */
-    H5Eget_auto2(H5tools_ERR_STACK_g, &tools_func, &tools_edata);
-    H5Eset_auto2(H5tools_ERR_STACK_g, NULL, NULL);
-
     HDmemset(&iter, 0, sizeof(iter));
 
     if(parse_command_line(argc, argv, &hand) < 0)
         goto done;
 
-    /* if drivername is not null, probably need to set the fapl */
-    if (HDstrcmp(drivername, "")) {
-        void *conf_fa = NULL;
+    /* enable error reporting if command line option */
+    h5tools_error_report();
 
-        if (!HDstrcmp(drivername, "ros3")) {
-#ifndef H5_HAVE_ROS3_VFD
-            error_msg("Read-Only S3 VFD not enabled.\n\n");
-            goto done;
-#else
-            conf_fa = (void *)&ros3_fa;
-#endif /* H5_HAVE_ROS3_VFD */
+    if (drivername) {
+        h5tools_vfd_info_t vfd_info;
 
-        }
-        else if (!HDstrcmp(drivername, "hdfs")) {
-#ifndef H5_HAVE_LIBHDFS
-            error_msg("HDFS VFD not enabled.\n\n");
+        vfd_info.info       = NULL;
+        vfd_info.name       = drivername;
+
+        if (!HDstrcmp(drivername, drivernames[ROS3_VFD_IDX])) {
+#ifdef H5_HAVE_ROS3_VFD
+            vfd_info.info = (void *)&ros3_fa;
+#else
+            error_msg("Read-Only S3 VFD not enabled.\n");
             goto done;
+#endif
+        }
+        else if (!HDstrcmp(drivername, drivernames[HDFS_VFD_IDX])) {
+#ifdef H5_HAVE_LIBHDFS
+            vfd_info.info = (void *)&hdfs_fa;
 #else
-            conf_fa = (void *)&hdfs_fa;
-#endif /* H5_HAVE_LIBHDFS */
+            error_msg("HDFS VFD not enabled.\n");
+            goto done;
+#endif
         }
 
-        if (conf_fa != NULL) {
-            HDassert(fapl_id == H5P_DEFAULT);
-            fapl_id = H5Pcreate(H5P_FILE_ACCESS);
-            if (fapl_id < 0) {
-                error_msg("Unable to create fapl entry\n");
-                goto done;
-            }
-            if (1 > h5tools_set_configured_fapl(fapl_id, drivername, conf_fa)) {
-                error_msg("Unable to set fapl\n");
-                goto done;
-            }
+        if ((fapl_id = h5tools_get_fapl(H5P_DEFAULT, &vfd_info)) < 0) {
+            error_msg("Unable to create FAPL for file access\n");
+            goto done;
         }
-    } /* drivername set */
+    }
 
     fname = argv[opt_ind];
 
-    if(enable_error_stack > 0) {
-        H5Eset_auto2(H5E_DEFAULT, func, edata);
-        H5Eset_auto2(H5tools_ERR_STACK_g, tools_func, tools_edata);
-    }
-
     /* Check for filename given */
     if(fname) {
         hid_t               fcpl;
@@ -1929,7 +1835,9 @@ main(int argc, const char *argv[])
 
         HDprintf("Filename: %s\n", fname);
 
-        fid = H5Fopen(fname, H5F_ACC_RDONLY, fapl_id);
+        fid = h5tools_fopen(fname, H5F_ACC_RDONLY, fapl_id,
+                (fapl_id == H5P_DEFAULT) ? FALSE : TRUE, NULL, 0);
+
         if(fid < 0) {
             error_msg("unable to open file \"%s\"\n", fname);
             h5tools_setstatus(EXIT_FAILURE);
@@ -2024,8 +1932,6 @@ done:
         h5tools_setstatus(EXIT_FAILURE);
     } /* end if */
 
-    H5Eset_auto2(H5E_DEFAULT, func, edata);
-
     leave(h5tools_getstatus());
 } /* end main() */
 
diff --git a/tools/src/misc/h5clear.c b/tools/src/misc/h5clear.c
index 42bb4ff..96cbf9c 100644
--- a/tools/src/misc/h5clear.c
+++ b/tools/src/misc/h5clear.c
@@ -266,9 +266,6 @@ main (int argc, const char *argv[])
     h5tools_setprogname(PROGRAMNAME);
     h5tools_setstatus(EXIT_SUCCESS);
 
-    /* Disable the HDF5 library's error reporting */
-    H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
-
     /* initialize h5tools lib */
     h5tools_init();
 
@@ -279,6 +276,9 @@ main (int argc, const char *argv[])
     if(fname_g == NULL)
         goto done;
 
+    /* enable error reporting if command line option */
+    h5tools_error_report();
+
     /* Print usage/exit if not using at least one of the options */
     if(!clear_status_flags && !remove_cache_image &&
        !increment_eoa_eof && !print_filesize) {
@@ -344,7 +344,7 @@ main (int argc, const char *argv[])
     }
 
     /* Open the file */
-    if((fid = h5tools_fopen(fname, flags, fapl, NULL, NULL, (size_t)0)) < 0) {
+    if((fid = h5tools_fopen(fname, flags, fapl, FALSE, NULL, (size_t)0)) < 0) {
         error_msg("h5tools_fopen\n");
         h5tools_setstatus(EXIT_FAILURE);
         goto done;
@@ -385,7 +385,6 @@ main (int argc, const char *argv[])
             warn_msg("No cache image in the file\n");
     }
 
-
     h5tools_setstatus(EXIT_SUCCESS);
 
 done:
diff --git a/tools/src/misc/h5debug.c b/tools/src/misc/h5debug.c
index b28457e..58a99a4 100644
--- a/tools/src/misc/h5debug.c
+++ b/tools/src/misc/h5debug.c
@@ -77,65 +77,64 @@ static const H5B2_class_t *
 get_H5B2_class(const uint8_t *sig)
 {
     H5B2_subid_t subtype = (H5B2_subid_t)sig[H5_SIZEOF_MAGIC + 1];
-    const H5B2_class_t *cls;
+    const H5B2_class_t *cls = NULL;
 
     switch(subtype) {
-    case H5B2_TEST_ID:
-        cls = H5B2_TEST;
-        break;
-
-    case H5B2_FHEAP_HUGE_INDIR_ID:
-        cls = H5HF_HUGE_BT2_INDIR;
-        break;
-
-    case H5B2_FHEAP_HUGE_FILT_INDIR_ID:
-        cls = H5HF_HUGE_BT2_FILT_INDIR;
-        break;
-
-    case H5B2_FHEAP_HUGE_DIR_ID:
-        cls = H5HF_HUGE_BT2_DIR;
-        break;
-
-    case H5B2_FHEAP_HUGE_FILT_DIR_ID:
-        cls = H5HF_HUGE_BT2_FILT_DIR;
-        break;
-
-    case H5B2_GRP_DENSE_NAME_ID:
-        cls = H5G_BT2_NAME;
-        break;
-
-    case H5B2_GRP_DENSE_CORDER_ID:
-        cls = H5G_BT2_CORDER;
-        break;
-
-    case H5B2_SOHM_INDEX_ID:
-        cls = H5SM_INDEX;
-        break;
-
-    case H5B2_ATTR_DENSE_NAME_ID:
-        cls = H5A_BT2_NAME;
-        break;
-
-    case H5B2_ATTR_DENSE_CORDER_ID:
-        cls = H5A_BT2_CORDER;
-        break;
-
-    case H5B2_CDSET_ID:
-        cls = H5D_BT2;
-        break;
-
-    case H5B2_CDSET_FILT_ID:
-        cls = H5D_BT2_FILT;
-        break;
-
-    case H5B2_TEST2_ID:
-        cls = H5B2_TEST2;
-        break;
-
-    case H5B2_NUM_BTREE_ID:
-    default:
-        HDfprintf(stderr, "Unknown v2 B-tree subtype %u\n", (unsigned)(subtype));
-        HDexit(4);
+        case H5B2_TEST_ID:
+            cls = H5B2_TEST;
+            break;
+
+        case H5B2_FHEAP_HUGE_INDIR_ID:
+            cls = H5HF_HUGE_BT2_INDIR;
+            break;
+
+        case H5B2_FHEAP_HUGE_FILT_INDIR_ID:
+            cls = H5HF_HUGE_BT2_FILT_INDIR;
+            break;
+
+        case H5B2_FHEAP_HUGE_DIR_ID:
+            cls = H5HF_HUGE_BT2_DIR;
+            break;
+
+        case H5B2_FHEAP_HUGE_FILT_DIR_ID:
+            cls = H5HF_HUGE_BT2_FILT_DIR;
+            break;
+
+        case H5B2_GRP_DENSE_NAME_ID:
+            cls = H5G_BT2_NAME;
+            break;
+
+        case H5B2_GRP_DENSE_CORDER_ID:
+            cls = H5G_BT2_CORDER;
+            break;
+
+        case H5B2_SOHM_INDEX_ID:
+            cls = H5SM_INDEX;
+            break;
+
+        case H5B2_ATTR_DENSE_NAME_ID:
+            cls = H5A_BT2_NAME;
+            break;
+
+        case H5B2_ATTR_DENSE_CORDER_ID:
+            cls = H5A_BT2_CORDER;
+            break;
+
+        case H5B2_CDSET_ID:
+            cls = H5D_BT2;
+            break;
+
+        case H5B2_CDSET_FILT_ID:
+            cls = H5D_BT2_FILT;
+            break;
+
+        case H5B2_TEST2_ID:
+            cls = H5B2_TEST2;
+            break;
+
+        case H5B2_NUM_BTREE_ID:
+        default:
+            HDfprintf(stderr, "Unknown v2 B-tree subtype %u\n", (unsigned)(subtype));
     } /* end switch */
 
     return(cls);
@@ -161,25 +160,24 @@ static const H5EA_class_t *
 get_H5EA_class(const uint8_t *sig)
 {
     H5EA_cls_id_t clsid = (H5EA_cls_id_t)sig[H5_SIZEOF_MAGIC + 1];
-    const H5EA_class_t *cls;
+    const H5EA_class_t *cls = NULL;
 
     switch(clsid) {
-    case H5EA_CLS_TEST_ID:
-        cls = H5EA_CLS_TEST;
-        break;
-
-    case H5EA_CLS_CHUNK_ID:
-        cls = H5EA_CLS_CHUNK;
-        break;
-
-    case H5EA_CLS_FILT_CHUNK_ID:
-        cls = H5EA_CLS_FILT_CHUNK;
-        break;
-
-    case H5EA_NUM_CLS_ID:
-    default:
-        HDfprintf(stderr, "Unknown extensible array class %u\n", (unsigned)(clsid));
-        HDexit(4);
+        case H5EA_CLS_TEST_ID:
+            cls = H5EA_CLS_TEST;
+            break;
+
+        case H5EA_CLS_CHUNK_ID:
+            cls = H5EA_CLS_CHUNK;
+            break;
+
+        case H5EA_CLS_FILT_CHUNK_ID:
+            cls = H5EA_CLS_FILT_CHUNK;
+            break;
+
+        case H5EA_NUM_CLS_ID:
+        default:
+            HDfprintf(stderr, "Unknown extensible array class %u\n", (unsigned)(clsid));
     } /* end switch */
 
     return(cls);
@@ -205,25 +203,24 @@ static const H5FA_class_t *
 get_H5FA_class(const uint8_t *sig)
 {
     H5FA_cls_id_t clsid = (H5FA_cls_id_t)sig[H5_SIZEOF_MAGIC + 1];
-    const H5FA_class_t *cls;
+    const H5FA_class_t *cls = NULL;
 
     switch(clsid) {
-    case H5FA_CLS_TEST_ID:
-        cls = H5FA_CLS_TEST;
-        break;
-
-    case H5FA_CLS_CHUNK_ID:
-        cls = H5FA_CLS_CHUNK;
-        break;
-
-    case H5FA_CLS_FILT_CHUNK_ID:
-        cls = H5FA_CLS_FILT_CHUNK;
-        break;
-
-    case H5FA_NUM_CLS_ID:
-    default:
-        HDfprintf(stderr, "Unknown fixed array class %u\n", (unsigned)(clsid));
-        HDexit(4);
+        case H5FA_CLS_TEST_ID:
+            cls = H5FA_CLS_TEST;
+            break;
+
+        case H5FA_CLS_CHUNK_ID:
+            cls = H5FA_CLS_CHUNK;
+            break;
+
+        case H5FA_CLS_FILT_CHUNK_ID:
+            cls = H5FA_CLS_FILT_CHUNK;
+            break;
+
+        case H5FA_NUM_CLS_ID:
+        default:
+            HDfprintf(stderr, "Unknown fixed array class %u\n", (unsigned)(clsid));
     } /* end switch */
 
     return(cls);
@@ -248,25 +245,31 @@ get_H5FA_class(const uint8_t *sig)
 int
 main(int argc, char *argv[])
 {
-    hid_t  fid, fapl;
+    hid_t       fid = H5I_INVALID_HID;
+    hid_t       fapl = H5I_INVALID_HID;
     H5F_t       *f;
-    haddr_t     addr = 0, extra = 0, extra2 = 0, extra3 = 0, extra4 = 0;
+    haddr_t     addr = 0;
+    int         extra_count = 0;     /* Number of extra arguments */
+    haddr_t     extra[10];
     uint8_t     sig[H5F_SIGNATURE_LEN];
     size_t      u;
     H5E_auto2_t func;
     void       *edata;
     hbool_t     api_ctx_pushed = FALSE;             /* Whether API context pushed */
     herr_t      status = SUCCEED;
+    int         exit_value = 0;
 
     if(argc == 1) {
-        HDfprintf(stderr, "Usage: %s filename [signature-addr [extra]]\n", argv[0]);
-        HDexit(1);
+        HDfprintf(stderr, "Usage: %s filename [signature-addr [extra]*]\n", argv[0]);
+        exit_value = 1;
+        goto done;
     } /* end if */
 
     /* Initialize the library */
     if(H5open() < 0) {
         HDfprintf(stderr, "cannot initialize the library\n");
-        HDexit(1);
+        exit_value = 1;
+        goto done;
     } /* end if */
 
     /* Disable error reporting */
@@ -278,49 +281,65 @@ main(int argc, char *argv[])
      */
     if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) {
         HDfprintf(stderr, "cannot create file access property list\n");
-        HDexit(1);
+        exit_value = 1;
+        goto done;
     } /* end if */
     if(HDstrchr(argv[1], '%'))
         if(H5Pset_fapl_family (fapl, (hsize_t)0, H5P_DEFAULT) < 0) {
             HDfprintf(stderr, "cannot set file access property list\n");
-            HDexit(1);
+            exit_value = 1;
+            goto done;
         }
     if((fid = H5Fopen(argv[1], H5F_ACC_RDONLY, fapl)) < 0) {
         HDfprintf(stderr, "cannot open file\n");
-        HDexit(1);
+        exit_value = 1;
+        goto done;
     } /* end if */
 
     /* Push API context */
     if(H5CX_push() < 0) {
         HDfprintf(stderr, "cannot set API context\n");
-        HDexit(1);
+        exit_value = 1;
+        goto done;
     }
     api_ctx_pushed = TRUE;
 
     if(NULL == (f = (H5F_t *)H5I_object(fid))) {
         HDfprintf(stderr, "cannot obtain H5F_t pointer\n");
-        HDexit(2);
+        exit_value = 2;
+        goto done;
     } /* end if */
 
     /* Ignore metadata tags while using h5debug */
     if(H5AC_ignore_tags(f) < 0) {
         HDfprintf(stderr, "cannot ignore metadata tags\n");
-        HDexit(1);
+        exit_value = 1;
+        goto done;
     }
 
     /*
      * Parse command arguments.
      */
+
+    /* Primary data structure to dump */
     if(argc > 2)
         addr = (haddr_t)HDstrtoll(argv[2], NULL, 0);
-    if(argc > 3)
-        extra = (haddr_t)HDstrtoll(argv[3], NULL, 0);
-    if(argc > 4)
-        extra2 = (haddr_t)HDstrtoll(argv[4], NULL, 0);
-    if(argc > 5)
-        extra3 = (haddr_t)HDstrtoll(argv[5], NULL, 0);
-    if(argc > 6)
-        extra4 = (haddr_t)HDstrtoll(argv[6], NULL, 0);
+
+    /* Extra arguments for primary data structure */
+    HDmemset(extra, 0, sizeof(extra));
+    if(argc > 3) {
+        /* Number of extra arguments */
+        extra_count = argc - 3;
+
+        /* Range check against 'extra' array size */
+        if(extra_count > (int)(sizeof(extra) / sizeof(haddr_t))) {
+            HDfprintf(stderr, "\nWARNING: Only using first %d extra parameters\n\n", (int)(sizeof(extra) / sizeof(haddr_t)));
+            extra_count = (int)(sizeof(extra) / sizeof(haddr_t));
+        } /* end if */
+
+        for(u = 0; u < (size_t)extra_count; u++)
+            extra[u] = (haddr_t)HDstrtoll(argv[u + 3], NULL, 0);
+    } /* end if */
 
     /*
      * Read the signature at the specified file position.
@@ -328,7 +347,8 @@ main(int argc, char *argv[])
     HDfprintf(stdout, "Reading signature at address %a (rel)\n", addr);
     if(H5F_block_read(f, H5FD_MEM_SUPER, addr, sizeof(sig), sig) < 0) {
         HDfprintf(stderr, "cannot read signature\n");
-        HDexit(3);
+        exit_value = 3;
+        goto done;
     }
     if(!HDmemcmp(sig, H5F_SIGNATURE, (size_t)H5F_SIGNATURE_LEN)) {
         /*
@@ -356,13 +376,13 @@ main(int argc, char *argv[])
          */
 
         /* Check for extra parameters */
-        if(extra == 0) {
+        if(extra_count == 0 || extra[0] == 0) {
             HDfprintf(stderr, "\nWarning: Providing the group's local heap address will give more information\n");
             HDfprintf(stderr, "Symbol table node usage:\n");
             HDfprintf(stderr, "\th5debug <filename> <Symbol table node address> <address of local heap>\n\n");
         } /* end if */
 
-        status = H5G_node_debug(f, addr, stdout, 0, VCOL, extra);
+        status = H5G_node_debug(f, addr, stdout, 0, VCOL, extra[0]);
 
     }
     else if(!HDmemcmp(sig, H5B_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
@@ -378,46 +398,51 @@ main(int argc, char *argv[])
         switch(subtype) {
         case H5B_SNODE_ID:
             /* Check for extra parameters */
-            if(extra == 0) {
+            if(extra_count == 0 || extra[0] == 0) {
                 HDfprintf(stderr, "\nWarning: Providing the group's local heap address will give more information\n");
                 HDfprintf(stderr, "B-tree symbol table node usage:\n");
                 HDfprintf(stderr, "\th5debug <filename> <B-tree node address> <address of local heap>\n\n");
-                HDexit(4);
+                exit_value = 4;
+                goto done;
             } /* end if */
 
-            status = H5G_node_debug(f, addr, stdout, 0, VCOL, extra);
+            status = H5G_node_debug(f, addr, stdout, 0, VCOL, extra[0]);
             break;
 
         case H5B_CHUNK_ID:
             /* Check for extra parameters */
-            if(extra == 0) {
+            if(extra_count == 0 || extra[0] == 0) {
                 HDfprintf(stderr, "ERROR: Need number of dimensions of chunk in order to dump chunk B-tree node\n");
                 HDfprintf(stderr, "B-tree chunked storage node usage:\n");
                 HDfprintf(stderr, "\th5debug <filename> <B-tree node address> <# of dimensions> <slowest chunk dim>...<fastest chunk dim>\n");
-                HDexit(4);
+                exit_value = 4;
+                goto done;
             } /* end if */
 
-            /* Build array of chunk dimensions */
-            ndims = (unsigned)extra;
-            dim[0] = (uint32_t)extra2;
-            if(ndims > 1)
-                dim[1] = (uint32_t)extra3;
-            if(ndims > 2)
-                dim[2] = (uint32_t)extra4;
+            /* Set # of dimensions */
+            ndims = (unsigned)extra[0];
 
             /* Check for dimension error */
-            if(ndims > 3) {
-                HDfprintf(stderr, "ERROR: Only 3 dimensions support currently (fix h5debug)\n");
+            if(ndims > 9) {
+                HDfprintf(stderr, "ERROR: Only 9 dimensions support currently (fix h5debug)\n");
                 HDfprintf(stderr, "B-tree chunked storage node usage:\n");
                 HDfprintf(stderr, "\th5debug <filename> <B-tree node address> <# of dimensions> <slowest chunk dim>...<fastest chunk dim>\n");
-                HDexit(4);
+                exit_value = 4;
+                goto done;
             } /* end for */
+
+            /* Build array of chunk dimensions */
+            for(u = 0; u < ndims; u++)
+                dim[u] = (uint32_t)extra[u + 1];
+
+            /* Check for dimension error */
             for(u = 0; u < ndims; u++)
                 if(0 == dim[u]) {
                     HDfprintf(stderr, "ERROR: Chunk dimensions should be >0\n");
                     HDfprintf(stderr, "B-tree chunked storage node usage:\n");
                     HDfprintf(stderr, "\th5debug <filename> <B-tree node address> <# of dimensions> <slowest chunk dim>...<fastest chunk dim>\n");
-                    HDexit(4);
+                    exit_value = 4;
+                    goto done;
                 } /* end if */
 
             /* Set the last dimension (the element size) to zero */
@@ -429,7 +454,8 @@ main(int argc, char *argv[])
         case H5B_NUM_BTREE_ID:
         default:
             HDfprintf(stderr, "Unknown v1 B-tree subtype %u\n", (unsigned)(subtype));
-            HDexit(4);
+            exit_value = 4;
+            goto done;
         }
 
     }
@@ -440,14 +466,15 @@ main(int argc, char *argv[])
         const H5B2_class_t *cls = get_H5B2_class(sig);
         HDassert(cls);
 
-        if((cls == H5D_BT2 || cls == H5D_BT2_FILT) && extra == 0) {
+        if((cls == H5D_BT2 || cls == H5D_BT2_FILT) && (extra_count == 0 || extra[0] == 0)) {
             HDfprintf(stderr, "ERROR: Need v2 B-tree header address and object header address containing the layout message in order to dump header\n");
             HDfprintf(stderr, "v2 B-tree hdr usage:\n");
             HDfprintf(stderr, "\th5debug <filename> <v2 B-tree header address> <object header address>\n");
-            HDexit(4);
+            exit_value = 4;
+            goto done;
         } /* end if */
 
-        status = H5B2__hdr_debug(f, addr, stdout, 0, VCOL, cls, (haddr_t)extra);
+        status = H5B2__hdr_debug(f, addr, stdout, 0, VCOL, cls, (haddr_t)extra[0]);
 
     }
     else if(!HDmemcmp(sig, H5B2_INT_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
@@ -458,23 +485,25 @@ main(int argc, char *argv[])
         HDassert(cls);
 
         /* Check for enough valid parameters */
-        if((cls == H5D_BT2 || cls == H5D_BT2_FILT) && (extra == 0 || extra2 == 0 || extra3 == 0 || extra4 == 0)) {
+        if((cls == H5D_BT2 || cls == H5D_BT2_FILT) && (extra_count == 0 || extra[0] == 0 || extra[1] == 0 || extra[2] == 0 || extra[3] == 0)) {
             HDfprintf(stderr, "ERROR: Need v2 B-tree header address, the node's number of records, depth, and object header address containing the layout message in order to dump internal node\n");
             HDfprintf(stderr, "NOTE: Leaf nodes are depth 0, the internal nodes above them are depth 1, etc.\n");
             HDfprintf(stderr, "v2 B-tree internal node usage:\n");
             HDfprintf(stderr, "\th5debug <filename> <internal node address> <v2 B-tree header address> <number of records> <depth> <object header address>\n");
-            HDexit(4);
+            exit_value = 4;
+            goto done;
 
         }
-        else if(extra == 0 || extra2 == 0 || extra3 == 0) {
+        else if(extra_count == 0 || extra[0] == 0 || extra[1] == 0 || extra[2] == 0) {
             HDfprintf(stderr, "ERROR: Need v2 B-tree header address and the node's number of records and depth in order to dump internal node\n");
             HDfprintf(stderr, "NOTE: Leaf nodes are depth 0, the internal nodes above them are depth 1, etc.\n");
             HDfprintf(stderr, "v2 B-tree internal node usage:\n");
             HDfprintf(stderr, "\th5debug <filename> <internal node address> <v2 B-tree header address> <number of records> <depth>\n");
-            HDexit(4);
+            exit_value = 4;
+            goto done;
         } /* end if */
 
-        status = H5B2__int_debug(f, addr, stdout, 0, VCOL, cls, extra, (unsigned)extra2, (unsigned)extra3, (haddr_t)extra4);
+        status = H5B2__int_debug(f, addr, stdout, 0, VCOL, cls, extra[0], (unsigned)extra[1], (unsigned)extra[2], (haddr_t)extra[3]);
 
     }
     else if(!HDmemcmp(sig, H5B2_LEAF_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
@@ -485,22 +514,24 @@ main(int argc, char *argv[])
         HDassert(cls);
 
         /* Check for enough valid parameters */
-        if((cls == H5D_BT2 || cls == H5D_BT2_FILT) && (extra == 0 || extra2 == 0 || extra3 == 0 )) {
+        if((cls == H5D_BT2 || cls == H5D_BT2_FILT) && (extra_count == 0 || extra[0] == 0 || extra[1] == 0 || extra[2] == 0 )) {
 
             HDfprintf(stderr, "ERROR: Need v2 B-tree header address, number of records, and object header address containing the layout message in order to dump leaf node\n");
             HDfprintf(stderr, "v2 B-tree leaf node usage:\n");
             HDfprintf(stderr, "\th5debug <filename> <leaf node address> <v2 B-tree header address> <number of records> <object header address>\n");
-            HDexit(4);
+            exit_value = 4;
+            goto done;
 
         }
-        else if(extra == 0 || extra2 == 0) {
+        else if(extra_count == 0 || extra[0] == 0 || extra[1] == 0) {
             HDfprintf(stderr, "ERROR: Need v2 B-tree header address and number of records in order to dump leaf node\n");
             HDfprintf(stderr, "v2 B-tree leaf node usage:\n");
             HDfprintf(stderr, "\th5debug <filename> <leaf node address> <v2 B-tree header address> <number of records>\n");
-            HDexit(4);
+            exit_value = 4;
+            goto done;
         } /* end if */
 
-        status = H5B2__leaf_debug(f, addr, stdout, 0, VCOL, cls, extra, (unsigned)extra2, (haddr_t)extra3);
+        status = H5B2__leaf_debug(f, addr, stdout, 0, VCOL, cls, extra[0], (unsigned)extra[1], (haddr_t)extra[2]);
 
     }
     else if(!HDmemcmp(sig, H5HF_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
@@ -516,14 +547,15 @@ main(int argc, char *argv[])
          */
 
         /* Check for enough valid parameters */
-        if(extra == 0 || extra2 == 0) {
+        if(extra_count == 0 || extra[0] == 0 || extra[1] == 0) {
             HDfprintf(stderr, "ERROR: Need fractal heap header address and size of direct block in order to dump direct block\n");
             HDfprintf(stderr, "Fractal heap direct block usage:\n");
             HDfprintf(stderr, "\th5debug <filename> <direct block address> <heap header address> <size of direct block>\n");
-            HDexit(4);
+            exit_value = 4;
+            goto done;
         } /* end if */
 
-        status = H5HF_dblock_debug(f, addr, stdout, 0, VCOL, extra, (size_t)extra2);
+        status = H5HF_dblock_debug(f, addr, stdout, 0, VCOL, extra[0], (size_t)extra[1]);
 
     }
     else if(!HDmemcmp(sig, H5HF_IBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
@@ -532,14 +564,15 @@ main(int argc, char *argv[])
          */
 
         /* Check for enough valid parameters */
-        if(extra == 0 || extra2 == 0) {
+        if(extra_count == 0 || extra[0] == 0 || extra[1] == 0) {
             HDfprintf(stderr, "ERROR: Need fractal heap header address and number of rows in order to dump indirect block\n");
             HDfprintf(stderr, "Fractal heap indirect block usage:\n");
             HDfprintf(stderr, "\th5debug <filename> <indirect block address> <heap header address> <number of rows>\n");
-            HDexit(4);
+            exit_value = 4;
+            goto done;
         } /* end if */
 
-        status = H5HF_iblock_debug(f, addr, stdout, 0, VCOL, extra, (unsigned)extra2);
+        status = H5HF_iblock_debug(f, addr, stdout, 0, VCOL, extra[0], (unsigned)extra[1]);
 
     }
     else if(!HDmemcmp(sig, H5FS_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
@@ -556,14 +589,15 @@ main(int argc, char *argv[])
          */
 
         /* Check for enough valid parameters */
-        if(extra == 0 || extra2 == 0) {
+        if(extra_count == 0 || extra[0] == 0 || extra[1] == 0) {
             HDfprintf(stderr, "ERROR: Need free space header address and client address in order to dump serialized sections\n");
             HDfprintf(stderr, "Free space serialized sections usage:\n");
             HDfprintf(stderr, "\th5debug <filename> <serialized sections address> <free space header address> <client address>\n");
-            HDexit(4);
+            exit_value = 4;
+            goto done;
         } /* end if */
 
-        status = H5FS_sects_debug(f, addr, stdout, 0, VCOL, extra, extra2);
+        status = H5FS_sects_debug(f, addr, stdout, 0, VCOL, extra[0], extra[1]);
 
     }
     else if(!HDmemcmp(sig, H5SM_TABLE_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
@@ -580,14 +614,15 @@ main(int argc, char *argv[])
          */
 
         /* Check for enough valid parameters */
-        if(extra == 0) {
+        if(extra_count == 0 || extra[0] == 0) {
             HDfprintf(stderr, "ERROR: Need shared message header address in order to shared message list\n");
             HDfprintf(stderr, "Shared message list usage:\n");
             HDfprintf(stderr, "\th5debug <filename> <shared message list address> <shared message header address>\n");
-            HDexit(4);
+            exit_value = 4;
+            goto done;
         } /* end if */
 
-        status = H5SM_list_debug(f, addr, stdout, 0, VCOL, (haddr_t)extra);
+        status = H5SM_list_debug(f, addr, stdout, 0, VCOL, (haddr_t)extra[0]);
 
     }
     else if(!HDmemcmp(sig, H5EA_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
@@ -598,14 +633,15 @@ main(int argc, char *argv[])
         HDassert(cls);
 
         /* Check for enough valid parameters */
-        if(extra == 0) {
+        if(extra_count == 0 || extra[0] == 0) {
             HDfprintf(stderr, "ERROR: Need object header address containing the layout message in order to dump header\n");
             HDfprintf(stderr, "Extensible array header block usage:\n");
             HDfprintf(stderr, "\th5debug <filename> <Extensible Array header address> <object header address>\n");
-            HDexit(4);
+            exit_value = 4;
+            goto done;
         } /* end if */
 
-        status = H5EA__hdr_debug(f, addr, stdout, 0, VCOL, cls, extra);
+        status = H5EA__hdr_debug(f, addr, stdout, 0, VCOL, cls, extra[0]);
 
     }
     else if(!HDmemcmp(sig, H5EA_IBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
@@ -616,14 +652,15 @@ main(int argc, char *argv[])
         HDassert(cls);
 
         /* Check for enough valid parameters */
-        if(extra == 0 || extra2 == 0) {
+        if(extra_count == 0 || extra[0] == 0 || extra[1] == 0) {
             HDfprintf(stderr, "ERROR: Need extensible array header address and object header address containing the layout message in order to dump index block\n");
             HDfprintf(stderr, "Extensible array index block usage:\n");
             HDfprintf(stderr, "\th5debug <filename> <index block address> <array header address> <object header address\n");
-            HDexit(4);
+            exit_value = 4;
+            goto done;
         } /* end if */
 
-        status = H5EA__iblock_debug(f, addr, stdout, 0, VCOL, cls, extra, extra2);
+        status = H5EA__iblock_debug(f, addr, stdout, 0, VCOL, cls, extra[0], extra[1]);
 
     }
     else if(!HDmemcmp(sig, H5EA_SBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
@@ -634,14 +671,15 @@ main(int argc, char *argv[])
         HDassert(cls);
 
         /* Check for enough valid parameters */
-        if(extra == 0 || extra2 == 0 || extra3 == 0) {
+        if(extra_count == 0 || extra[0] == 0 || extra[1] == 0 || extra[2] == 0) {
             HDfprintf(stderr, "ERROR: Need extensible array header address, super block index and object header address containing the layout message in order to dump super block\n");
             HDfprintf(stderr, "Extensible array super block usage:\n");
             HDfprintf(stderr, "\th5debug <filename> <super block address> <array header address> <super block index> <object header address>\n");
-            HDexit(4);
+            exit_value = 4;
+            goto done;
         } /* end if */
 
-        status = H5EA__sblock_debug(f, addr, stdout, 0, VCOL, cls, extra, (unsigned)extra2, extra3);
+        status = H5EA__sblock_debug(f, addr, stdout, 0, VCOL, cls, extra[0], (unsigned)extra[1], extra[2]);
 
     }
     else if(!HDmemcmp(sig, H5EA_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
@@ -652,14 +690,15 @@ main(int argc, char *argv[])
         HDassert(cls);
 
         /* Check for enough valid parameters */
-        if(extra == 0 || extra2 == 0 || extra3 == 0) {
+        if(extra_count == 0 || extra[0] == 0 || extra[1] == 0 || extra[2] == 0) {
             HDfprintf(stderr, "ERROR: Need extensible array header address, # of elements in data block and object header address containing the layout message in order to dump data block\n");
             HDfprintf(stderr, "Extensible array data block usage:\n");
             HDfprintf(stderr, "\th5debug <filename> <data block address> <array header address> <# of elements in data block> <object header address\n");
-            HDexit(4);
+            exit_value = 4;
+            goto done;
         } /* end if */
 
-        status = H5EA__dblock_debug(f, addr, stdout, 0, VCOL, cls, extra, (size_t)extra2, extra3);
+        status = H5EA__dblock_debug(f, addr, stdout, 0, VCOL, cls, extra[0], (size_t)extra[1], extra[2]);
 
     }
     else if(!HDmemcmp(sig, H5FA_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
@@ -670,14 +709,15 @@ main(int argc, char *argv[])
         HDassert(cls);
 
         /* Check for enough valid parameters */
-        if(extra == 0) {
+        if(extra_count == 0 || extra[0] == 0) {
             HDfprintf(stderr, "ERROR: Need object header address containing the layout message in order to dump header\n");
             HDfprintf(stderr, "Fixed array header block usage:\n");
             HDfprintf(stderr, "\th5debug <filename> <Fixed Array header address> <object header address>\n");
-            HDexit(4);
+            exit_value = 4;
+            goto done;
         } /* end if */
 
-        status = H5FA__hdr_debug(f, addr, stdout, 0, VCOL, cls, extra);
+        status = H5FA__hdr_debug(f, addr, stdout, 0, VCOL, cls, extra[0]);
 
     }
     else if(!HDmemcmp(sig, H5FA_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
@@ -688,14 +728,15 @@ main(int argc, char *argv[])
         HDassert(cls);
 
         /* Check for enough valid parameters */
-        if(extra == 0 || extra2 == 0) {
+        if(extra_count == 0 || extra[0] == 0 || extra[1] == 0) {
             HDfprintf(stderr, "ERROR: Need fixed array header address and object header address containing the layout message in order to dump data block\n");
             HDfprintf(stderr, "fixed array data block usage:\n");
             HDfprintf(stderr, "\th5debug <filename> <data block address> <array header address> <object header address>\n");
-            HDexit(4);
+            exit_value = 4;
+            goto done;
         } /* end if */
 
-        status = H5FA__dblock_debug(f, addr, stdout, 0, VCOL, cls, extra, extra2);
+        status = H5FA__dblock_debug(f, addr, stdout, 0, VCOL, cls, extra[0], extra[1]);
 
     }
     else if(!HDmemcmp(sig, H5O_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
@@ -732,24 +773,27 @@ main(int argc, char *argv[])
         HDputchar('\n');
 
         HDfprintf(stderr, "unknown signature\n");
-        HDexit(4);
+        exit_value = 4;
+        goto done;
     } /* end else */
 
     /* Check for an error when dumping information */
     if(status < 0) {
         HDfprintf(stderr, "An error occurred!\n");
         H5Eprint2(H5E_DEFAULT, stderr);
-        HDexit(5);
+        exit_value = 5;
+        goto done;
     } /* end if */
 
-    H5Pclose(fapl);
-    H5Fclose(fid);
+done:
+    if(fapl > 0) H5Pclose(fapl);
+    if(fid > 0) H5Fclose(fid);
 
     /* Pop API context */
     if(api_ctx_pushed) H5CX_pop();
 
     H5Eset_auto2(H5E_DEFAULT, func, edata);
 
-    return 0;
+    return exit_value;
 } /* main() */
 
diff --git a/tools/src/misc/h5mkgrp.c b/tools/src/misc/h5mkgrp.c
index feb60d4..71db297 100644
--- a/tools/src/misc/h5mkgrp.c
+++ b/tools/src/misc/h5mkgrp.c
@@ -25,26 +25,28 @@ int d_status = EXIT_SUCCESS;
 /* command-line options: short and long-named parameters */
 static const char *s_opts = "hlpvV";
 static struct long_options l_opts[] = {
-    { "help", no_arg, 'h' },
-    { "latest", no_arg, 'l' },
-    { "parents", no_arg, 'p' },
-    { "verbose", no_arg, 'v' },
-    { "version", no_arg, 'V' },
+    { "help",               no_arg, 'h' },
+    { "latest",             no_arg, 'l' },
+    { "parents",            no_arg, 'p' },
+    { "verbose",            no_arg, 'v' },
+    { "version",            no_arg, 'V' },
     { NULL, 0, '\0' }
 };
 
 /* Command line parameter settings */
-typedef struct {
+typedef struct mkgrp_opt_t {
     char *fname;                /* File name to operate on */
     hbool_t latest;             /* Whether file should use latest format versions */
     hbool_t verbose;            /* Whether output should be verbose */
     hbool_t parents;            /* Whether to create intermediate groups */
     size_t ngroups;             /* Number of groups to create */
     char **groups;              /* Pointer to array of group names */
-} param_t;
-param_t params;             /* Command line parameter settings */
+    hid_t fapl_id;              /* fapl to use when opening the file */
+} mkgrp_opt_t;
+
+mkgrp_opt_t params_g;           /* Command line parameter settings */
+
 
-
 /*-------------------------------------------------------------------------
  * Function:    leave
  *
@@ -61,18 +63,22 @@ leave(int ret)
 {
     size_t curr_group;
 
-    if (params.fname)
-        HDfree (params.fname);
-    if (params.ngroups) {
-        for(curr_group = 0; curr_group < params.ngroups; curr_group++)
-            HDfree (params.groups[curr_group]);
-        HDfree (params.groups);
+    if (params_g.fname)
+        HDfree(params_g.fname);
+    if (params_g.ngroups) {
+        for (curr_group = 0; curr_group < params_g.ngroups; curr_group++)
+            HDfree(params_g.groups[curr_group]);
+        HDfree(params_g.groups);
     }
+    if (H5I_INVALID_HID != params_g.fapl_id && H5P_DEFAULT != params_g.fapl_id)
+        if (H5Pclose(params_g.fapl_id) < 0)
+            error_msg("Could not close file access property list\n");
+
     h5tools_close();
     HDexit(ret);
 } /* end leave() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: usage
  *
@@ -85,65 +91,69 @@ leave(int ret)
  *-------------------------------------------------------------------------
  */
 static void
-usage(void)
+usage(const char *prog)
 {
-    HDfprintf(stdout, "\
-usage: h5mkgrp [OPTIONS] FILE GROUP...\n\
-   OPTIONS\n\
-      -h, --help         Print a usage message and exit\n\
-      -l, --latest       Use latest version of file format to create groups\n\
-      -p, --parents      No error if existing, make parent groups as needed\n\
-      -v, --verbose      Print information about OBJECTS and OPTIONS\n\
-      -V, --version      Print version number and exit\n");
+    FLUSHSTREAM(rawoutstream);
+    PRINTSTREAM(rawoutstream, "usage: %s [OPTIONS] FILE GROUP...\n", prog);
+    PRINTVALSTREAM(rawoutstream, "   OPTIONS\n");
+    PRINTVALSTREAM(rawoutstream, "      -h, --help         Print a usage message and exit\n");
+    PRINTVALSTREAM(rawoutstream, "      -l, --latest       Use latest version of file format to create groups\n");
+    PRINTVALSTREAM(rawoutstream, "      -p, --parents      No error if existing, make parent groups as needed\n");
+    PRINTVALSTREAM(rawoutstream, "      -v, --verbose      Print information about OBJECTS and OPTIONS\n");
+    PRINTVALSTREAM(rawoutstream, "      -V, --version      Print version number and exit\n");
+    PRINTVALSTREAM(rawoutstream, "\n");
 } /* end usage() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function: parse_command_line
+ * Function:    parse_command_line
  *
- * Purpose: Parses command line and sets up global variable to control output
+ * Purpose:     Parses command line and sets up global variable to control
+ *              output
  *
- * Return:  Success: 0
- *    Failure: -1
+ * Return:      Success: 0
+ *              Failure: -1
  *
  * Programmer: Quincey Koziol, 2/13/2007
  *
  *-------------------------------------------------------------------------
  */
 static int
-parse_command_line(int argc, const char *argv[], param_t *parms)
+parse_command_line(int argc, const char *argv[], mkgrp_opt_t *options)
 {
     int opt;            /* Option from command line */
     size_t curr_group;  /* Current group name to copy */
+    hbool_t custom_fapl = FALSE;
+    hid_t tmp_fapl_id = H5I_INVALID_HID;
 
     /* Check for empty command line */
     if(argc == 1) {
-        usage();
+        usage(h5tools_getprogname());
         leave(EXIT_SUCCESS);
-    } /* end if */
+    }
 
     /* Parse command line options */
     while((opt = get_option(argc, argv, s_opts, l_opts)) != EOF) {
         switch((char)opt) {
             /* Display 'help' */
             case 'h':
-                usage();
+                usage(h5tools_getprogname());
                 leave(EXIT_SUCCESS);
                 break;
 
             /* Create objects with the latest version of the format */
             case 'l':
-                parms->latest = TRUE;
+                options->latest = TRUE;
                 break;
 
             /* Create parent groups */
             case 'p':
-                parms->parents = TRUE;
+                options->parents = TRUE;
                 break;
 
             /* Verbose output */
             case 'v':
-                parms->verbose = TRUE;
+                options->verbose = TRUE;
                 break;
 
             /* Display version */
@@ -154,7 +164,7 @@ parse_command_line(int argc, const char *argv[], param_t *parms)
 
             /* Bad command line argument */
             default:
-                usage();
+                usage(h5tools_getprogname());
                 leave(EXIT_FAILURE);
         } /* end switch */
     } /* end while */
@@ -162,46 +172,37 @@ parse_command_line(int argc, const char *argv[], param_t *parms)
     /* Check for file name to be processed */
     if(argc <= opt_ind) {
         error_msg("missing file name\n");
-        usage();
+        usage(h5tools_getprogname());
         leave(EXIT_FAILURE);
-    } /* end if */
+    }
 
     /* Retrieve file name */
-    parms->fname = HDstrdup(argv[opt_ind]);
+    options->fname = HDstrdup(argv[opt_ind]);
     opt_ind++;
 
     /* Check for group(s) to be created */
     if(argc <= opt_ind) {
         error_msg("missing group name(s)\n");
-        usage();
+        usage(h5tools_getprogname());
         leave(EXIT_FAILURE);
-    } /* end if */
+    }
 
     /* Allocate space for the group name pointers */
-    parms->ngroups = (size_t)(argc - opt_ind);
-    parms->groups = (char **)HDmalloc(parms->ngroups * sizeof(char *));
+    options->ngroups = (size_t)(argc - opt_ind);
+    options->groups = (char **)HDmalloc(options->ngroups * sizeof(char *));
 
     /* Retrieve the group names */
     curr_group = 0;
     while(opt_ind < argc) {
-        parms->groups[curr_group] = HDstrdup(argv[opt_ind]);
+        options->groups[curr_group] = HDstrdup(argv[opt_ind]);
         curr_group++;
         opt_ind++;
-    } /* end while */
-
-#ifdef QAK
-HDfprintf(stderr, "parms->parents = %t\n", parms->parents);
-HDfprintf(stderr, "parms->verbose = %t\n", parms->verbose);
-HDfprintf(stderr, "parms->fname = '%s'\n", parms->fname);
-HDfprintf(stderr, "parms->ngroups = %Zu\n", parms->ngroups);
-for(curr_group = 0; curr_group < parms->ngroups; curr_group++)
-    HDfprintf(stderr, "parms->group[%Zu] = '%s'\n", curr_group, parms->groups[curr_group]);
-#endif /* QAK */
+    }
 
-    return(0);
+    return 0;
 } /* parse_command_line() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: main
  *
@@ -214,117 +215,112 @@ for(curr_group = 0; curr_group < parms->ngroups; curr_group++)
 int
 main(int argc, const char *argv[])
 {
-    hid_t fid;                  /* HDF5 file ID */
-    hid_t fapl_id;              /* File access property list ID */
-    hid_t lcpl_id;              /* Link creation property list ID */
-    size_t curr_group;          /* Current group to create */
+    hid_t fid = H5I_INVALID_HID;        /* HDF5 file ID */
+    hid_t lcpl_id = H5I_INVALID_HID;    /* Link creation property list ID */
+    size_t curr_group;                  /* Current group to create */
 
     h5tools_setprogname(PROGRAMNAME);
     h5tools_setstatus(EXIT_SUCCESS);
 
-    /* Disable the HDF5 library's error reporting */
-    H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
-
     /* Initialize h5tools lib */
     h5tools_init();
 
-    /* Parse command line */
-    HDmemset(&params, 0, sizeof(params));
-    if(parse_command_line(argc, argv, &params) < 0) {
-        error_msg("unable to parse command line arguments\n");
-        leave(EXIT_FAILURE);
-    } /* end if */
+    /* Initialize the parameters */
+    HDmemset(&params_g, 0, sizeof(params_g));
 
     /* Create file access property list */
-    if((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0) {
+    if((params_g.fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0) {
         error_msg("Could not create file access property list\n");
         leave(EXIT_FAILURE);
-    } /* end if */
+    }
+
+    /* Parse command line */
+    if(parse_command_line(argc, argv, &params_g) < 0) {
+        error_msg("unable to parse command line arguments\n");
+        leave(EXIT_FAILURE);
+    }
+
+    /* enable error reporting if command line option */
+    h5tools_error_report();
 
     /* Check for creating groups with new format version */
-    if(params.latest) {
+    if(params_g.latest) {
         /* Set the "use the latest version of the format" bounds */
-        if(H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) {
+        if(H5Pset_libver_bounds(params_g.fapl_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) {
             error_msg("Could not set property for using latest version of the format\n");
             leave(EXIT_FAILURE);
-        } /* end if */
+        }
 
         /* Display some output if requested */
-        if(params.verbose)
+        if(params_g.verbose)
             HDprintf("%s: Creating groups with latest version of the format\n", h5tools_getprogname());
-    } /* end if */
+    }
 
     /* Attempt to open an existing HDF5 file first */
-    fid = h5tools_fopen(params.fname, H5F_ACC_RDWR, fapl_id, NULL, NULL, 0);
+    fid = h5tools_fopen(params_g.fname, H5F_ACC_RDWR, params_g.fapl_id, FALSE, NULL, 0);
 
     /* If we couldn't open an existing file, try creating file */
     /* (use "EXCL" instead of "TRUNC", so we don't blow away existing non-HDF5 file) */
     if(fid < 0)
-        fid = H5Fcreate(params.fname, H5F_ACC_EXCL, H5P_DEFAULT, fapl_id);
+        fid = H5Fcreate(params_g.fname, H5F_ACC_EXCL, H5P_DEFAULT, params_g.fapl_id);
 
     /* Test for error in opening file */
     if(fid < 0) {
-        error_msg("Could not open output file '%s'\n", params.fname);
+        error_msg("Could not open output file '%s'\n", params_g.fname);
         leave(EXIT_FAILURE);
-    } /* end if */
+    }
 
     /* Create link creation property list */
     if((lcpl_id = H5Pcreate(H5P_LINK_CREATE)) < 0) {
         error_msg("Could not create link creation property list\n");
         leave(EXIT_FAILURE);
-    } /* end if */
+    }
 
     /* Check for creating intermediate groups */
-    if(params.parents) {
+    if(params_g.parents) {
         /* Set the intermediate group creation property */
         if(H5Pset_create_intermediate_group(lcpl_id, TRUE) < 0) {
             error_msg("Could not set property for creating parent groups\n");
             leave(EXIT_FAILURE);
-        } /* end if */
+        }
 
         /* Display some output if requested */
-        if(params.verbose)
+        if(params_g.verbose)
             HDprintf("%s: Creating parent groups\n", h5tools_getprogname());
-    } /* end if */
+    }
 
     /* Loop over creating requested groups */
-    for(curr_group = 0; curr_group < params.ngroups; curr_group++) {
+    for(curr_group = 0; curr_group < params_g.ngroups; curr_group++) {
         hid_t gid;              /* Group ID */
 
         /* Attempt to create a group */
-        if((gid = H5Gcreate2(fid, params.groups[curr_group], lcpl_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
-            error_msg("Could not create group '%s'\n", params.groups[curr_group]);
+        if((gid = H5Gcreate2(fid, params_g.groups[curr_group], lcpl_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
+            error_msg("Could not create group '%s'\n", params_g.groups[curr_group]);
             leave(EXIT_FAILURE);
-        } /* end if */
+        }
 
         /* Close the group */
         if(H5Gclose(gid) < 0) {
-            error_msg("Could not close group '%s'??\n", params.groups[curr_group]);
+            error_msg("Could not close group '%s'??\n", params_g.groups[curr_group]);
             leave(EXIT_FAILURE);
-        } /* end if */
+        }
 
         /* Display some output if requested */
-        if(params.verbose)
-            HDprintf("%s: created group '%s'\n", h5tools_getprogname(), params.groups[curr_group]);
+        if(params_g.verbose)
+            HDprintf("%s: created group '%s'\n", h5tools_getprogname(), params_g.groups[curr_group]);
     } /* end for */
 
     /* Close link creation property list */
     if(H5Pclose(lcpl_id) < 0) {
         error_msg("Could not close link creation property list\n");
         leave(EXIT_FAILURE);
-    } /* end if */
+    }
 
     /* Close file */
     if(H5Fclose(fid) < 0) {
-        error_msg("Could not close output file '%s'??\n", params.fname);
+        error_msg("Could not close output file '%s'??\n", params_g.fname);
         leave(EXIT_FAILURE);
-    } /* end if */
-
-    /* Close file access property list */
-    if(H5Pclose(fapl_id) < 0) {
-        error_msg("Could not close file access property list\n");
-        leave(EXIT_FAILURE);
-    } /* end if */
+    }
 
     leave(EXIT_SUCCESS);
 } /* end main() */
diff --git a/tools/test/h5diff/CMakeTests.cmake b/tools/test/h5diff/CMakeTests.cmake
index 2e4d969..bb59774 100644
--- a/tools/test/h5diff/CMakeTests.cmake
+++ b/tools/test/h5diff/CMakeTests.cmake
@@ -68,6 +68,8 @@
       ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/tudfilter2.h5
       ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/diff_strings1.h5
       ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/diff_strings2.h5
+      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/diff_eps1.h5
+      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/diff_eps2.h5
       # tools/testfiles/vds
       ${HDF5_TOOLS_DIR}/testfiles/vds/1_a.h5
       ${HDF5_TOOLS_DIR}/testfiles/vds/1_b.h5
@@ -201,6 +203,7 @@
       ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_56.txt
       ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_57.txt
       ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_58.txt
+      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_58_ref.txt
       ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_59.txt
       ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_500.txt
       ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_501.txt
@@ -289,6 +292,7 @@
       ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_v2.txt
       ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_v3.txt
       ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_vlstr.txt
+      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_eps.txt
   )
 
   set (LIST_WIN_TEST_FILES
@@ -528,6 +532,9 @@
   # strings
   set (STRINGS1 diff_strings1.h5)
   set (STRINGS2 diff_strings2.h5)
+  # epsilon
+  set (EPS1 diff_eps1.h5)
+  set (EPS2 diff_eps2.h5)
 
 # VDS tests
   set (FILEV1 1_vds.h5)
@@ -913,6 +920,8 @@
           h5diff_v3.out.err
           h5diff_vlstr.out
           h5diff_vlstr.out.err
+          h5diff_eps.out
+          h5diff_eps.out.err
     )
     set_tests_properties (H5DIFF-clearall-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
     if (last_test)
@@ -1040,7 +1049,8 @@ ADD_H5_TEST (h5diff_56 1 -v ${FILE4} ${FILE4} dset6a dset6b)
 ADD_H5_TEST (h5diff_57 0 -v ${FILE4} ${FILE4} dset7a dset7b)
 
 # 5.8 (region reference)
-ADD_H5_TEST (h5diff_58 1 -v ${FILE7} ${FILE8} refreg)
+ADD_H5_TEST (h5diff_58 1 -v2 ${FILE7} ${FILE8} refreg)
+ADD_H5_TEST (h5diff_58_ref 1 -v2 ${FILE7} ${FILE8} /g1/reference2D)
 
 # test for both dset and attr with same type but with different size
 # ( HDDFV-7942 )
@@ -1091,6 +1101,9 @@ ADD_H5_TEST (h5diff_609 0 -d 200 ${FILE1} ${FILE2} g1/dset3 g1/dset4)
 # 6.10: number smaller than smallest difference
 ADD_H5_TEST (h5diff_610 1 -d 1 ${FILE1} ${FILE2} g1/dset3 g1/dset4)
 
+# eps: number smaller than epsilon
+ADD_H5_TEST (h5diff_eps 0 -v3 -d 1e-16 ${EPS1} ${EPS2})
+
 # ##############################################################################
 # # -p
 # ##############################################################################
@@ -1476,9 +1489,9 @@ ADD_H5_TEST (h5diff_484 0 -v --exclude-path "/dset3" ${EXCLUDE_FILE1_1} ${EXCLUD
 # Only one file contains unique objs. Common objs are same.
 # (HDFFV-7837)
 #
-ADD_H5_TEST (h5diff_485 0 -v --exclude-path "/group1" h5diff_exclude3-1.h5 h5diff_exclude3-2.h5)
-ADD_H5_TEST (h5diff_486 0 -v --exclude-path "/group1" h5diff_exclude3-2.h5 h5diff_exclude3-1.h5)
-ADD_H5_TEST (h5diff_487 1 -v --exclude-path "/group1/dset" h5diff_exclude3-1.h5 h5diff_exclude3-2.h5)
+ADD_H5_TEST (h5diff_485 0 -v --exclude-path "/group1" ${EXCLUDE_FILE3_1} ${EXCLUDE_FILE3_2})
+ADD_H5_TEST (h5diff_486 0 -v --exclude-path "/group1" ${EXCLUDE_FILE3_2} ${EXCLUDE_FILE3_1})
+ADD_H5_TEST (h5diff_487 1 -v --exclude-path "/group1/dset" ${EXCLUDE_FILE3_1} ${EXCLUDE_FILE3_2})
 
 # ##############################################################################
 # # diff various multiple vlen and fixed strings in a compound type dataset
@@ -1512,8 +1525,6 @@ ADD_H5_TEST (h5diff_646 1 -v --use-system-epsilon -p 0.05 ${FILE1} ${FILE2} /g1/
 # ##############################################################################
 # # Test array variances
 # ##############################################################################
-#
-# Test with -d , -p and --use-system-epsilon.
 ADD_H5_TEST (h5diff_800 1 -v ${FILE7} ${FILE8} /g1/array /g1/array)
 ADD_H5_TEST (h5diff_801 1 -v ${FILE7} ${FILE8A} /g1/array /g1/array)
 
diff --git a/tools/test/h5diff/h5diffgentest.c b/tools/test/h5diff/h5diffgentest.c
index 623205c..af54c50 100644
--- a/tools/test/h5diff/h5diffgentest.c
+++ b/tools/test/h5diff/h5diffgentest.c
@@ -96,6 +96,9 @@ size_t H5TOOLS_MALLOCSIZE = (128 * 1024 * 1024);
 /* string dataset and attribute */
 #define DIFF_STRINGS1 "diff_strings1.h5"
 #define DIFF_STRINGS2 "diff_strings2.h5"
+/* double dataset and epsilon */
+#define DIFF_EPS1 "diff_eps1.h5"
+#define DIFF_EPS2 "diff_eps2.h5"
 
 #define UIMAX    4294967295u /*Maximum value for a variable of type unsigned int */
 #define STR_SIZE 3
@@ -110,7 +113,7 @@ size_t H5TOOLS_MALLOCSIZE = (128 * 1024 * 1024);
 
 /* Error macros */
 #define AT()            HDprintf("ERROR at %s:%d in %s()...\n", __FILE__, __LINE__, FUNC);
-#define PROGRAM_ERROR   {AT(); goto error;}
+#define PROGRAM_ERROR   do {AT(); goto error;} while(0)
 
 /* A UD link traversal function.  Shouldn't actually be called. */
 static hid_t
@@ -172,6 +175,7 @@ static void test_comps_vlen_arry(const char *fname, const char *dset,
 static void test_data_nocomparables(const char *fname, int diff);
 static void test_objs_nocomparables(const char *fname1, const char *fname2);
 static void test_objs_strings(const char *fname, const char *fname2);
+static void test_double_epsilon(const char *fname1, const char *fname2);
 
 /* called by test_attributes() and test_datasets() */
 static void write_attr_strings(hid_t loc_id, const char* dset_name, hid_t fid, int make_diffs);
@@ -288,6 +292,9 @@ int main(void)
     /* string dataset and attribute. HDFFV-10028 */
     test_objs_strings(DIFF_STRINGS1, DIFF_STRINGS2);
 
+    /* double dataset and epsilion. HDFFV-10897 */
+    test_double_epsilon(DIFF_EPS1, DIFF_EPS2);
+
     return EXIT_SUCCESS;
 }
 
@@ -432,14 +439,12 @@ int test_basic(const char *fname1, const char *fname2, const char *fname3)
         /* epsilon = 0.0000000000000001 = 1e-16
         * system epsilon for double : DBL_EPSILON = 2.22045E-16
         */
-        double data13[3][2] = { { H5_DOUBLE(0.0000000000000000), H5_DOUBLE(
-                0.0000000000000001) }, { H5_DOUBLE(0.0000000000000001),
-                        H5_DOUBLE(0.0000000000000000) }, { H5_DOUBLE(
-                                0.00000000000000033), H5_DOUBLE(0.0000000000000001) } };
-        double data14[3][2] = { { H5_DOUBLE(0.0000000000000000), H5_DOUBLE(
-                0.0000000000000004) }, { H5_DOUBLE(0.0000000000000002),
-                        H5_DOUBLE(0.0000000000000001) }, { H5_DOUBLE(
-                                0.0000000000000001), H5_DOUBLE(0.00000000000000000) } };
+        double data13[3][2] = { { 0.0000000000000000, 0.0000000000000001 },
+                                { 0.0000000000000001, 0.0000000000000000 },
+                                { 0.00000000000000033, 0.0000000000000001 } };
+        double data14[3][2] = { { 0.0000000000000000, 0.0000000000000004 },
+                                { 0.0000000000000002, 0.0000000000000001 },
+                                { 0.0000000000000001, 0.00000000000000000 } };
 
         write_dset(gid1, 2, dims2, "fp1", H5T_NATIVE_FLOAT, data11);
         write_dset(gid1, 2, dims2, "fp2", H5T_NATIVE_FLOAT, data12);
@@ -4227,7 +4232,7 @@ static void test_comps_array(const char *fname, const char *dset, const char *at
     hsize_t sdims_dset[] = { SDIM_DSET };
     hsize_t sdims_cmpd_arry[] = { SDIM_CMPD_ARRAY };
     int i, j;
-    herr_t ret; /* Generic return value  */
+    herr_t H5_ATTR_NDEBUG_UNUSED ret; /* Generic return value  */
 
     /* Initialize array data to write */
     for (i = 0; i < SDIM_DSET; i++) {
@@ -4336,7 +4341,7 @@ static void test_comps_vlen(const char * fname, const char *dset, const char *at
     hsize_t sdims_dset[] = { SDIM_DSET };
 
     unsigned i, j; /* counting variables */
-    herr_t ret; /* Generic return value  */
+    herr_t H5_ATTR_NDEBUG_UNUSED ret; /* Generic return value  */
 
     /* Allocate and initialize VL data to write */
     for (i = 0; i < SDIM_DSET; i++) {
@@ -4454,7 +4459,7 @@ static void test_comps_array_vlen(const char * fname, const char *dset, const ch
     hsize_t sdims_dset[] = { SDIM_DSET };
     hsize_t sdims_arry[] = { SDIM_CMPD_ARRAY };
     unsigned i, j, k; /* counting variables */
-    herr_t ret; /* Generic return value  */
+    herr_t H5_ATTR_NDEBUG_UNUSED ret; /* Generic return value  */
 
     /* Initialize array data to write in compound1 */
     for (i = 0; i < SDIM_DSET; i++) {
@@ -4597,7 +4602,7 @@ static void test_comps_vlen_arry(const char * fname, const char *dset, const cha
     hsize_t sdims_cmpd_arry[] = { SDIM_CMPD_ARRAY };
 
     unsigned i, j, k; /* counting variables */
-    herr_t ret; /* Generic return value  */
+    herr_t H5_ATTR_NDEBUG_UNUSED ret; /* Generic return value  */
 
     /* Allocate and initialize VL data to write */
     for (i = 0; i < SDIM_DSET; i++) {
@@ -4930,73 +4935,73 @@ test_objs_nocomparables(const char *fname1, const char *fname2)
     *------------------------------------------------------------------------*/
     /* file1 */
     if((fid1 = H5Fopen(fname1, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
-        PROGRAM_ERROR
+        PROGRAM_ERROR;
 
     /* file2 */
     if((fid2 = H5Fopen(fname2, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
-        PROGRAM_ERROR
+        PROGRAM_ERROR;
 
     /*-----------------------------------------------------------------------
     * in file1 : add member objects
     *------------------------------------------------------------------------*/
     /* parent group */
     if((topgid1 = H5Gcreate2(fid1, "diffobjtypes", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-        PROGRAM_ERROR
+        PROGRAM_ERROR;
 
     /* dataset */
     if(write_dset(topgid1, 1, dims, "obj1", H5T_NATIVE_INT, data1) < 0)
-        PROGRAM_ERROR
+        PROGRAM_ERROR;
 
     /* group */
     if((gid1 = H5Gcreate2(topgid1, "obj2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-        PROGRAM_ERROR
+        PROGRAM_ERROR;
 
     /* committed type */
     if((tid1 = H5Tcopy(H5T_NATIVE_INT)) < 0)
-        PROGRAM_ERROR
+        PROGRAM_ERROR;
     if(H5Tcommit2(topgid1, "obj3", tid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0)
-        PROGRAM_ERROR
+        PROGRAM_ERROR;
 
     /*-----------------------------------------------------------------------
     * in file2 : add member objects
     *------------------------------------------------------------------------*/
     /* parent group */
     if((topgid2 = H5Gcreate2(fid2, "diffobjtypes", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-        PROGRAM_ERROR
+        PROGRAM_ERROR;
 
     /* group */
     if((gid2 = H5Gcreate2(topgid2, "obj1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-        PROGRAM_ERROR
+        PROGRAM_ERROR;
 
     /* committed type */
     if((tid2 = H5Tcopy(H5T_NATIVE_INT)) < 0)
-        PROGRAM_ERROR
+        PROGRAM_ERROR;
     if(H5Tcommit2(topgid2, "obj2", tid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0)
-        PROGRAM_ERROR
+        PROGRAM_ERROR;
 
     /* dataset */
     if(write_dset(topgid2, 1, dims, "obj3", H5T_NATIVE_INT, data2) < 0)
-        PROGRAM_ERROR
+        PROGRAM_ERROR;
 
     /*-----------------------------------------------------------------------
     * Close IDs
     *-----------------------------------------------------------------------*/
     if(H5Fclose(fid1) < 0)
-        PROGRAM_ERROR
+        PROGRAM_ERROR;
     if(H5Fclose(fid2) < 0)
-        PROGRAM_ERROR
+        PROGRAM_ERROR;
     if(H5Gclose(topgid1) < 0)
-        PROGRAM_ERROR
+        PROGRAM_ERROR;
     if(H5Gclose(topgid2) < 0)
-        PROGRAM_ERROR
+        PROGRAM_ERROR;
     if(H5Gclose(gid1) < 0)
-        PROGRAM_ERROR
+        PROGRAM_ERROR;
     if(H5Gclose(gid2) < 0)
-        PROGRAM_ERROR
+        PROGRAM_ERROR;
     if(H5Tclose(tid1) < 0)
-        PROGRAM_ERROR
+        PROGRAM_ERROR;
     if(H5Tclose(tid2) < 0)
-        PROGRAM_ERROR
+        PROGRAM_ERROR;
 
     return;
 
@@ -5214,7 +5219,7 @@ void write_attr_strings(hid_t loc_id, const char* dset_name, hid_t fid, int make
     hid_t aid = H5I_INVALID_HID;
     hid_t sid = H5I_INVALID_HID;
     hid_t tid = H5I_INVALID_HID;
-    herr_t status;
+    herr_t H5_ATTR_NDEBUG_UNUSED status;
     int val, i, j, k, l, n;
     float f;
 
@@ -6205,7 +6210,7 @@ void write_attr_in(hid_t loc_id, const char* dset_name, hid_t fid, int make_diff
     hid_t aid = H5I_INVALID_HID;
     hid_t sid = H5I_INVALID_HID;
     hid_t tid = H5I_INVALID_HID;
-    herr_t status;
+    herr_t H5_ATTR_NDEBUG_UNUSED status;
     int val, i, j, k, l, n;
     float f;
 
@@ -7197,7 +7202,7 @@ void write_dset_in(hid_t loc_id, const char* dset_name, hid_t fid, int make_diff
     hid_t sid = H5I_INVALID_HID;
     hid_t tid = H5I_INVALID_HID;
     hid_t dcpl = H5I_INVALID_HID;
-    herr_t status;
+    herr_t H5_ATTR_NDEBUG_UNUSED status;
     int val, i, j, k, l, n;
     float f;
     int fillvalue = 2;
@@ -7832,7 +7837,7 @@ void gen_datareg(hid_t fid, int make_diffs /* flag to modify data buffers */)
     hsize_t start[10]; /* starting location of hyperslab */
     hsize_t count[10]; /* element count of hyperslab */
     hsize_t coord[5][2]; /* coordinates for point selection */
-    herr_t status;
+    herr_t H5_ATTR_NDEBUG_UNUSED status;
     int i;
 
     /* allocate the buffer for write the references */
@@ -8020,6 +8025,60 @@ out:
     return -1;
 }
 
+/*
+ * Function: test_double_epsilion
+ *
+ * Purpose: Create test files to compare data with epsilion
+ */
+static
+void test_double_epsilon(const char *fname1, const char *fname2)
+{
+    hid_t    fid1 = H5I_INVALID_HID, fid2 = H5I_INVALID_HID;
+    hsize_t  dims1[2] = { 4, 7 };
+    hsize_t  dims2[2] = { 4, 7 };
+    double   wdata[4][7];
+    int i, j;
+
+    /*-------------------------------------------------------------------------
+    * create two files
+    *-------------------------------------------------------------------------
+    */
+    if ((fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        PROGRAM_ERROR;
+    if ((fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        PROGRAM_ERROR;
+
+    /*
+    * Initialize data.
+    */
+    for (i=0; i<4; i++)
+        for (j=0; j<7; j++)
+            wdata[i][j] = 0.0;
+
+    /* dataset */
+    if(write_dset(fid1, 2, dims1, "dataset", H5T_IEEE_F64LE, wdata) < 0)
+        PROGRAM_ERROR;
+
+    /*
+    * Initialize data.
+    */
+    for (i=0; i<4; i++)
+        for (j=0; j<7; j++)
+            wdata[i][j] = (double)1.e-19;
+
+    /* dataset */
+    if(write_dset(fid2, 2, dims1, "dataset", H5T_IEEE_F64LE, wdata) < 0)
+        PROGRAM_ERROR;
+
+error:
+    H5E_BEGIN_TRY {
+        H5Fclose(fid1);
+        H5Fclose(fid2);
+    } H5E_END_TRY;
+
+    return;
+}
+
 /*-------------------------------------------------------------------------
  * Function: write_attr
  *
@@ -8075,22 +8134,22 @@ write_dset(hid_t loc_id, int rank, hsize_t *dims, const char *name, hid_t tid, v
 
     /* create a space  */
     if((sid = H5Screate_simple(rank, dims, NULL)) < 0)
-        PROGRAM_ERROR
+        PROGRAM_ERROR;
 
     /* create the dataset */
     if((did = H5Dcreate2(loc_id, name, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-        PROGRAM_ERROR
+        PROGRAM_ERROR;
 
     /* write */
     if(buf)
         if(H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
-            PROGRAM_ERROR
+            PROGRAM_ERROR;
 
     /* close */
     if(H5Dclose(did) < 0)
-        PROGRAM_ERROR
+        PROGRAM_ERROR;
     if(H5Sclose(sid) < 0)
-        PROGRAM_ERROR
+        PROGRAM_ERROR;
 
     return SUCCEED;
 
diff --git a/tools/test/h5diff/testfiles/diff_eps1.h5 b/tools/test/h5diff/testfiles/diff_eps1.h5
new file mode 100644
index 0000000..2803a1d
--- /dev/null
+++ b/tools/test/h5diff/testfiles/diff_eps1.h5
diff --git a/tools/test/h5diff/testfiles/diff_eps2.h5 b/tools/test/h5diff/testfiles/diff_eps2.h5
new file mode 100644
index 0000000..4acf27a
--- /dev/null
+++ b/tools/test/h5diff/testfiles/diff_eps2.h5
diff --git a/tools/test/h5diff/testfiles/h5diff_10.txt b/tools/test/h5diff/testfiles/h5diff_10.txt
index 11ad800..0618705 100644
--- a/tools/test/h5diff/testfiles/h5diff_10.txt
+++ b/tools/test/h5diff/testfiles/h5diff_10.txt
@@ -17,10 +17,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          Verbose mode with level. Print differences and list of objects.
          Level of detail depends on value of N:
           0 : Identical to '-v' or '--verbose'.
-          1 : All level 0 information plus one-line attribute
-              status summary.
-          2 : All level 1 information plus extended attribute
-              status report.
+          1 : All level 0 information plus one-line attribute status summary.
+          2 : All level 1 information plus extended attribute status report.
+          3 : All level 2 information plus file names.
    -q, --quiet
          Quiet mode. Do not produce output.
    --enable-error-stack
@@ -97,6 +96,14 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          excluded.
          This option can be used repeatedly to exclude multiple paths.
 
+   --exclude-attribute "path/to/object/with/attribute"
+         Exclude attributes on the specified path to an object when comparing files or groups.
+
+         If there are multiple paths to an object, only the specified path(s)
+         will be excluded; the comparison will include any path not explicitly
+         excluded.
+         This option can be used repeatedly to exclude multiple paths.
+
  Modes of output:
   Default mode: print the number of differences found and where they occured
   -r Report mode: print the above plus the differences
diff --git a/tools/test/h5diff/testfiles/h5diff_58.txt b/tools/test/h5diff/testfiles/h5diff_58.txt
index d27a0c9..da147bc 100644
--- a/tools/test/h5diff/testfiles/h5diff_58.txt
+++ b/tools/test/h5diff/testfiles/h5diff_58.txt
@@ -1,3 +1,4 @@
+
 dataset: </refreg> and </refreg>
 Referenced dataset      10784            10784
 ------------------------------------------------------------
@@ -8,4 +9,7 @@ point #1              (2,2)              (3,3)
 point #3              (1,6)              (2,5)
 point #4              (2,8)              (1,7)
 4 differences found
+   obj1   obj2
+ --------------------------------------
+Attributes status:  0 common, 0 only in obj1, 0 only in obj2
 EXIT CODE: 1
diff --git a/tools/test/h5diff/testfiles/h5diff_58_ref.txt b/tools/test/h5diff/testfiles/h5diff_58_ref.txt
new file mode 100644
index 0000000..48a4b33
--- /dev/null
+++ b/tools/test/h5diff/testfiles/h5diff_58_ref.txt
@@ -0,0 +1,37 @@
+
+dataset: </g1/reference2D> and </g1/reference2D>
+size:           [2]           [2]
+position        reference2D     reference2D     difference          
+------------------------------------------------------------
+[ 0 ]          1               0               1              
+[ 1 ]          2               0               2              
+size:           [2]           [2]
+position        reference2D     reference2D     difference          
+------------------------------------------------------------
+[ 0 ]          1               0               1              
+[ 1 ]          2               0               2              
+size:           [2]           [2]
+position        reference2D     reference2D     difference          
+------------------------------------------------------------
+[ 0 ]          1               0               1              
+[ 1 ]          2               0               2              
+size:           [2]           [2]
+position        reference2D     reference2D     difference          
+------------------------------------------------------------
+[ 0 ]          1               0               1              
+[ 1 ]          2               0               2              
+size:           [2]           [2]
+position        reference2D     reference2D     difference          
+------------------------------------------------------------
+[ 0 ]          1               0               1              
+[ 1 ]          2               0               2              
+size:           [2]           [2]
+position        reference2D     reference2D     difference          
+------------------------------------------------------------
+[ 0 ]          1               0               1              
+[ 1 ]          2               0               2              
+12 differences found
+   obj1   obj2
+ --------------------------------------
+Attributes status:  0 common, 0 only in obj1, 0 only in obj2
+EXIT CODE: 1
diff --git a/tools/test/h5diff/testfiles/h5diff_600.txt b/tools/test/h5diff/testfiles/h5diff_600.txt
index 13d627c..98c80be 100644
--- a/tools/test/h5diff/testfiles/h5diff_600.txt
+++ b/tools/test/h5diff/testfiles/h5diff_600.txt
@@ -17,10 +17,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          Verbose mode with level. Print differences and list of objects.
          Level of detail depends on value of N:
           0 : Identical to '-v' or '--verbose'.
-          1 : All level 0 information plus one-line attribute
-              status summary.
-          2 : All level 1 information plus extended attribute
-              status report.
+          1 : All level 0 information plus one-line attribute status summary.
+          2 : All level 1 information plus extended attribute status report.
+          3 : All level 2 information plus file names.
    -q, --quiet
          Quiet mode. Do not produce output.
    --enable-error-stack
@@ -97,6 +96,14 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          excluded.
          This option can be used repeatedly to exclude multiple paths.
 
+   --exclude-attribute "path/to/object/with/attribute"
+         Exclude attributes on the specified path to an object when comparing files or groups.
+
+         If there are multiple paths to an object, only the specified path(s)
+         will be excluded; the comparison will include any path not explicitly
+         excluded.
+         This option can be used repeatedly to exclude multiple paths.
+
  Modes of output:
   Default mode: print the number of differences found and where they occured
   -r Report mode: print the above plus the differences
diff --git a/tools/test/h5diff/testfiles/h5diff_603.txt b/tools/test/h5diff/testfiles/h5diff_603.txt
index 0d6b474..a5bb805 100644
--- a/tools/test/h5diff/testfiles/h5diff_603.txt
+++ b/tools/test/h5diff/testfiles/h5diff_603.txt
@@ -18,10 +18,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          Verbose mode with level. Print differences and list of objects.
          Level of detail depends on value of N:
           0 : Identical to '-v' or '--verbose'.
-          1 : All level 0 information plus one-line attribute
-              status summary.
-          2 : All level 1 information plus extended attribute
-              status report.
+          1 : All level 0 information plus one-line attribute status summary.
+          2 : All level 1 information plus extended attribute status report.
+          3 : All level 2 information plus file names.
    -q, --quiet
          Quiet mode. Do not produce output.
    --enable-error-stack
@@ -98,6 +97,14 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          excluded.
          This option can be used repeatedly to exclude multiple paths.
 
+   --exclude-attribute "path/to/object/with/attribute"
+         Exclude attributes on the specified path to an object when comparing files or groups.
+
+         If there are multiple paths to an object, only the specified path(s)
+         will be excluded; the comparison will include any path not explicitly
+         excluded.
+         This option can be used repeatedly to exclude multiple paths.
+
  Modes of output:
   Default mode: print the number of differences found and where they occured
   -r Report mode: print the above plus the differences
diff --git a/tools/test/h5diff/testfiles/h5diff_606.txt b/tools/test/h5diff/testfiles/h5diff_606.txt
index 94f44e8..4782e17 100644
--- a/tools/test/h5diff/testfiles/h5diff_606.txt
+++ b/tools/test/h5diff/testfiles/h5diff_606.txt
@@ -18,10 +18,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          Verbose mode with level. Print differences and list of objects.
          Level of detail depends on value of N:
           0 : Identical to '-v' or '--verbose'.
-          1 : All level 0 information plus one-line attribute
-              status summary.
-          2 : All level 1 information plus extended attribute
-              status report.
+          1 : All level 0 information plus one-line attribute status summary.
+          2 : All level 1 information plus extended attribute status report.
+          3 : All level 2 information plus file names.
    -q, --quiet
          Quiet mode. Do not produce output.
    --enable-error-stack
@@ -98,6 +97,14 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          excluded.
          This option can be used repeatedly to exclude multiple paths.
 
+   --exclude-attribute "path/to/object/with/attribute"
+         Exclude attributes on the specified path to an object when comparing files or groups.
+
+         If there are multiple paths to an object, only the specified path(s)
+         will be excluded; the comparison will include any path not explicitly
+         excluded.
+         This option can be used repeatedly to exclude multiple paths.
+
  Modes of output:
   Default mode: print the number of differences found and where they occured
   -r Report mode: print the above plus the differences
diff --git a/tools/test/h5diff/testfiles/h5diff_612.txt b/tools/test/h5diff/testfiles/h5diff_612.txt
index 7f83c64..ee40713 100644
--- a/tools/test/h5diff/testfiles/h5diff_612.txt
+++ b/tools/test/h5diff/testfiles/h5diff_612.txt
@@ -18,10 +18,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          Verbose mode with level. Print differences and list of objects.
          Level of detail depends on value of N:
           0 : Identical to '-v' or '--verbose'.
-          1 : All level 0 information plus one-line attribute
-              status summary.
-          2 : All level 1 information plus extended attribute
-              status report.
+          1 : All level 0 information plus one-line attribute status summary.
+          2 : All level 1 information plus extended attribute status report.
+          3 : All level 2 information plus file names.
    -q, --quiet
          Quiet mode. Do not produce output.
    --enable-error-stack
@@ -98,6 +97,14 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          excluded.
          This option can be used repeatedly to exclude multiple paths.
 
+   --exclude-attribute "path/to/object/with/attribute"
+         Exclude attributes on the specified path to an object when comparing files or groups.
+
+         If there are multiple paths to an object, only the specified path(s)
+         will be excluded; the comparison will include any path not explicitly
+         excluded.
+         This option can be used repeatedly to exclude multiple paths.
+
  Modes of output:
   Default mode: print the number of differences found and where they occured
   -r Report mode: print the above plus the differences
diff --git a/tools/test/h5diff/testfiles/h5diff_615.txt b/tools/test/h5diff/testfiles/h5diff_615.txt
index 3cfe6b9..5504812 100644
--- a/tools/test/h5diff/testfiles/h5diff_615.txt
+++ b/tools/test/h5diff/testfiles/h5diff_615.txt
@@ -18,10 +18,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          Verbose mode with level. Print differences and list of objects.
          Level of detail depends on value of N:
           0 : Identical to '-v' or '--verbose'.
-          1 : All level 0 information plus one-line attribute
-              status summary.
-          2 : All level 1 information plus extended attribute
-              status report.
+          1 : All level 0 information plus one-line attribute status summary.
+          2 : All level 1 information plus extended attribute status report.
+          3 : All level 2 information plus file names.
    -q, --quiet
          Quiet mode. Do not produce output.
    --enable-error-stack
@@ -98,6 +97,14 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          excluded.
          This option can be used repeatedly to exclude multiple paths.
 
+   --exclude-attribute "path/to/object/with/attribute"
+         Exclude attributes on the specified path to an object when comparing files or groups.
+
+         If there are multiple paths to an object, only the specified path(s)
+         will be excluded; the comparison will include any path not explicitly
+         excluded.
+         This option can be used repeatedly to exclude multiple paths.
+
  Modes of output:
   Default mode: print the number of differences found and where they occured
   -r Report mode: print the above plus the differences
diff --git a/tools/test/h5diff/testfiles/h5diff_621.txt b/tools/test/h5diff/testfiles/h5diff_621.txt
index 9c34945..e4dba56 100644
--- a/tools/test/h5diff/testfiles/h5diff_621.txt
+++ b/tools/test/h5diff/testfiles/h5diff_621.txt
@@ -18,10 +18,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          Verbose mode with level. Print differences and list of objects.
          Level of detail depends on value of N:
           0 : Identical to '-v' or '--verbose'.
-          1 : All level 0 information plus one-line attribute
-              status summary.
-          2 : All level 1 information plus extended attribute
-              status report.
+          1 : All level 0 information plus one-line attribute status summary.
+          2 : All level 1 information plus extended attribute status report.
+          3 : All level 2 information plus file names.
    -q, --quiet
          Quiet mode. Do not produce output.
    --enable-error-stack
@@ -98,6 +97,14 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          excluded.
          This option can be used repeatedly to exclude multiple paths.
 
+   --exclude-attribute "path/to/object/with/attribute"
+         Exclude attributes on the specified path to an object when comparing files or groups.
+
+         If there are multiple paths to an object, only the specified path(s)
+         will be excluded; the comparison will include any path not explicitly
+         excluded.
+         This option can be used repeatedly to exclude multiple paths.
+
  Modes of output:
   Default mode: print the number of differences found and where they occured
   -r Report mode: print the above plus the differences
diff --git a/tools/test/h5diff/testfiles/h5diff_622.txt b/tools/test/h5diff/testfiles/h5diff_622.txt
index 2b2df2f..0e7ffa3 100644
--- a/tools/test/h5diff/testfiles/h5diff_622.txt
+++ b/tools/test/h5diff/testfiles/h5diff_622.txt
@@ -18,10 +18,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          Verbose mode with level. Print differences and list of objects.
          Level of detail depends on value of N:
           0 : Identical to '-v' or '--verbose'.
-          1 : All level 0 information plus one-line attribute
-              status summary.
-          2 : All level 1 information plus extended attribute
-              status report.
+          1 : All level 0 information plus one-line attribute status summary.
+          2 : All level 1 information plus extended attribute status report.
+          3 : All level 2 information plus file names.
    -q, --quiet
          Quiet mode. Do not produce output.
    --enable-error-stack
@@ -98,6 +97,14 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          excluded.
          This option can be used repeatedly to exclude multiple paths.
 
+   --exclude-attribute "path/to/object/with/attribute"
+         Exclude attributes on the specified path to an object when comparing files or groups.
+
+         If there are multiple paths to an object, only the specified path(s)
+         will be excluded; the comparison will include any path not explicitly
+         excluded.
+         This option can be used repeatedly to exclude multiple paths.
+
  Modes of output:
   Default mode: print the number of differences found and where they occured
   -r Report mode: print the above plus the differences
diff --git a/tools/test/h5diff/testfiles/h5diff_623.txt b/tools/test/h5diff/testfiles/h5diff_623.txt
index 3e80438..bb70458 100644
--- a/tools/test/h5diff/testfiles/h5diff_623.txt
+++ b/tools/test/h5diff/testfiles/h5diff_623.txt
@@ -18,10 +18,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          Verbose mode with level. Print differences and list of objects.
          Level of detail depends on value of N:
           0 : Identical to '-v' or '--verbose'.
-          1 : All level 0 information plus one-line attribute
-              status summary.
-          2 : All level 1 information plus extended attribute
-              status report.
+          1 : All level 0 information plus one-line attribute status summary.
+          2 : All level 1 information plus extended attribute status report.
+          3 : All level 2 information plus file names.
    -q, --quiet
          Quiet mode. Do not produce output.
    --enable-error-stack
@@ -98,6 +97,14 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          excluded.
          This option can be used repeatedly to exclude multiple paths.
 
+   --exclude-attribute "path/to/object/with/attribute"
+         Exclude attributes on the specified path to an object when comparing files or groups.
+
+         If there are multiple paths to an object, only the specified path(s)
+         will be excluded; the comparison will include any path not explicitly
+         excluded.
+         This option can be used repeatedly to exclude multiple paths.
+
  Modes of output:
   Default mode: print the number of differences found and where they occured
   -r Report mode: print the above plus the differences
diff --git a/tools/test/h5diff/testfiles/h5diff_624.txt b/tools/test/h5diff/testfiles/h5diff_624.txt
index 7a2f585..cb30023 100644
--- a/tools/test/h5diff/testfiles/h5diff_624.txt
+++ b/tools/test/h5diff/testfiles/h5diff_624.txt
@@ -18,10 +18,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          Verbose mode with level. Print differences and list of objects.
          Level of detail depends on value of N:
           0 : Identical to '-v' or '--verbose'.
-          1 : All level 0 information plus one-line attribute
-              status summary.
-          2 : All level 1 information plus extended attribute
-              status report.
+          1 : All level 0 information plus one-line attribute status summary.
+          2 : All level 1 information plus extended attribute status report.
+          3 : All level 2 information plus file names.
    -q, --quiet
          Quiet mode. Do not produce output.
    --enable-error-stack
@@ -98,6 +97,14 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          excluded.
          This option can be used repeatedly to exclude multiple paths.
 
+   --exclude-attribute "path/to/object/with/attribute"
+         Exclude attributes on the specified path to an object when comparing files or groups.
+
+         If there are multiple paths to an object, only the specified path(s)
+         will be excluded; the comparison will include any path not explicitly
+         excluded.
+         This option can be used repeatedly to exclude multiple paths.
+
  Modes of output:
   Default mode: print the number of differences found and where they occured
   -r Report mode: print the above plus the differences
diff --git a/tools/test/h5diff/testfiles/h5diff_70.txt b/tools/test/h5diff/testfiles/h5diff_70.txt
index efa34ea..b0b8bf6 100644
--- a/tools/test/h5diff/testfiles/h5diff_70.txt
+++ b/tools/test/h5diff/testfiles/h5diff_70.txt
@@ -1183,10 +1183,42 @@ position        opaque3D of </dset> opaque3D of </dset> difference
 [ 3 2 1 ]          24              0               24             
 24 differences found
 attribute: <reference of </dset>> and <reference of </dset>>
+Not comparable: <reference of </dset>> or <reference of </dset>> is an empty dataset
+Not comparable: <reference of </dset>> or <reference of </dset>> is an empty dataset
 0 differences found
 attribute: <reference2D of </dset>> and <reference2D of </dset>>
+Not comparable: <reference2D of </dset>> or <reference2D of </dset>> is an empty dataset
+Not comparable: <reference2D of </dset>> or <reference2D of </dset>> is an empty dataset
+Not comparable: <reference2D of </dset>> or <reference2D of </dset>> is an empty dataset
+Not comparable: <reference2D of </dset>> or <reference2D of </dset>> is an empty dataset
+Not comparable: <reference2D of </dset>> or <reference2D of </dset>> is an empty dataset
+Not comparable: <reference2D of </dset>> or <reference2D of </dset>> is an empty dataset
 0 differences found
 attribute: <reference3D of </dset>> and <reference3D of </dset>>
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
 0 differences found
 attribute: <string of </dset>> and <string of </dset>>
 size:           [2]           [2]
diff --git a/tools/test/h5diff/testfiles/h5diff_700.txt b/tools/test/h5diff/testfiles/h5diff_700.txt
index 851a407..6cf9893 100644
--- a/tools/test/h5diff/testfiles/h5diff_700.txt
+++ b/tools/test/h5diff/testfiles/h5diff_700.txt
@@ -1187,10 +1187,42 @@ position        opaque3D of </dset> opaque3D of </dset> difference
 [ 3 2 1 ]          24              0               24             
 24 differences found
 attribute: <reference of </dset>> and <reference of </dset>>
+Not comparable: <reference of </dset>> or <reference of </dset>> is an empty dataset
+Not comparable: <reference of </dset>> or <reference of </dset>> is an empty dataset
 0 differences found
 attribute: <reference2D of </dset>> and <reference2D of </dset>>
+Not comparable: <reference2D of </dset>> or <reference2D of </dset>> is an empty dataset
+Not comparable: <reference2D of </dset>> or <reference2D of </dset>> is an empty dataset
+Not comparable: <reference2D of </dset>> or <reference2D of </dset>> is an empty dataset
+Not comparable: <reference2D of </dset>> or <reference2D of </dset>> is an empty dataset
+Not comparable: <reference2D of </dset>> or <reference2D of </dset>> is an empty dataset
+Not comparable: <reference2D of </dset>> or <reference2D of </dset>> is an empty dataset
 0 differences found
 attribute: <reference3D of </dset>> and <reference3D of </dset>>
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
 0 differences found
 attribute: <string of </dset>> and <string of </dset>>
 size:           [2]           [2]
diff --git a/tools/test/h5diff/testfiles/h5diff_701.txt b/tools/test/h5diff/testfiles/h5diff_701.txt
index 33f1a0f..4187754 100644
--- a/tools/test/h5diff/testfiles/h5diff_701.txt
+++ b/tools/test/h5diff/testfiles/h5diff_701.txt
@@ -1254,10 +1254,42 @@ position        opaque3D of </dset> opaque3D of </dset> difference
 [ 3 2 1 ]          24              0               24             
 24 differences found
 attribute: <reference of </dset>> and <reference of </dset>>
+Not comparable: <reference of </dset>> or <reference of </dset>> is an empty dataset
+Not comparable: <reference of </dset>> or <reference of </dset>> is an empty dataset
 0 differences found
 attribute: <reference2D of </dset>> and <reference2D of </dset>>
+Not comparable: <reference2D of </dset>> or <reference2D of </dset>> is an empty dataset
+Not comparable: <reference2D of </dset>> or <reference2D of </dset>> is an empty dataset
+Not comparable: <reference2D of </dset>> or <reference2D of </dset>> is an empty dataset
+Not comparable: <reference2D of </dset>> or <reference2D of </dset>> is an empty dataset
+Not comparable: <reference2D of </dset>> or <reference2D of </dset>> is an empty dataset
+Not comparable: <reference2D of </dset>> or <reference2D of </dset>> is an empty dataset
 0 differences found
 attribute: <reference3D of </dset>> and <reference3D of </dset>>
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
 0 differences found
 attribute: <string of </dset>> and <string of </dset>>
 size:           [2]           [2]
diff --git a/tools/test/h5diff/testfiles/h5diff_702.txt b/tools/test/h5diff/testfiles/h5diff_702.txt
index 851a407..6cf9893 100644
--- a/tools/test/h5diff/testfiles/h5diff_702.txt
+++ b/tools/test/h5diff/testfiles/h5diff_702.txt
@@ -1187,10 +1187,42 @@ position        opaque3D of </dset> opaque3D of </dset> difference
 [ 3 2 1 ]          24              0               24             
 24 differences found
 attribute: <reference of </dset>> and <reference of </dset>>
+Not comparable: <reference of </dset>> or <reference of </dset>> is an empty dataset
+Not comparable: <reference of </dset>> or <reference of </dset>> is an empty dataset
 0 differences found
 attribute: <reference2D of </dset>> and <reference2D of </dset>>
+Not comparable: <reference2D of </dset>> or <reference2D of </dset>> is an empty dataset
+Not comparable: <reference2D of </dset>> or <reference2D of </dset>> is an empty dataset
+Not comparable: <reference2D of </dset>> or <reference2D of </dset>> is an empty dataset
+Not comparable: <reference2D of </dset>> or <reference2D of </dset>> is an empty dataset
+Not comparable: <reference2D of </dset>> or <reference2D of </dset>> is an empty dataset
+Not comparable: <reference2D of </dset>> or <reference2D of </dset>> is an empty dataset
 0 differences found
 attribute: <reference3D of </dset>> and <reference3D of </dset>>
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
 0 differences found
 attribute: <string of </dset>> and <string of </dset>>
 size:           [2]           [2]
diff --git a/tools/test/h5diff/testfiles/h5diff_703.txt b/tools/test/h5diff/testfiles/h5diff_703.txt
index 33f1a0f..4187754 100644
--- a/tools/test/h5diff/testfiles/h5diff_703.txt
+++ b/tools/test/h5diff/testfiles/h5diff_703.txt
@@ -1254,10 +1254,42 @@ position        opaque3D of </dset> opaque3D of </dset> difference
 [ 3 2 1 ]          24              0               24             
 24 differences found
 attribute: <reference of </dset>> and <reference of </dset>>
+Not comparable: <reference of </dset>> or <reference of </dset>> is an empty dataset
+Not comparable: <reference of </dset>> or <reference of </dset>> is an empty dataset
 0 differences found
 attribute: <reference2D of </dset>> and <reference2D of </dset>>
+Not comparable: <reference2D of </dset>> or <reference2D of </dset>> is an empty dataset
+Not comparable: <reference2D of </dset>> or <reference2D of </dset>> is an empty dataset
+Not comparable: <reference2D of </dset>> or <reference2D of </dset>> is an empty dataset
+Not comparable: <reference2D of </dset>> or <reference2D of </dset>> is an empty dataset
+Not comparable: <reference2D of </dset>> or <reference2D of </dset>> is an empty dataset
+Not comparable: <reference2D of </dset>> or <reference2D of </dset>> is an empty dataset
 0 differences found
 attribute: <reference3D of </dset>> and <reference3D of </dset>>
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
+Not comparable: <reference3D of </dset>> or <reference3D of </dset>> is an empty dataset
 0 differences found
 attribute: <string of </dset>> and <string of </dset>>
 size:           [2]           [2]
diff --git a/tools/test/h5diff/testfiles/h5diff_80.txt b/tools/test/h5diff/testfiles/h5diff_80.txt
index b223eed..11dccd8 100644
--- a/tools/test/h5diff/testfiles/h5diff_80.txt
+++ b/tools/test/h5diff/testfiles/h5diff_80.txt
@@ -528,166 +528,166 @@ position        opaque3D        opaque3D        difference
 24 differences found
 dataset: </g1/reference> and </g1/reference>
 size:           [2]           [2]
-position                                        difference          
+position        reference       reference       difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 size:           [2]           [2]
-position                                        difference          
+position        reference       reference       difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 4 differences found
 dataset: </g1/reference2D> and </g1/reference2D>
 size:           [2]           [2]
-position                                        difference          
+position        reference2D     reference2D     difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 size:           [2]           [2]
-position                                        difference          
+position        reference2D     reference2D     difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 size:           [2]           [2]
-position                                        difference          
+position        reference2D     reference2D     difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 size:           [2]           [2]
-position                                        difference          
+position        reference2D     reference2D     difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 size:           [2]           [2]
-position                                        difference          
+position        reference2D     reference2D     difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 size:           [2]           [2]
-position                                        difference          
+position        reference2D     reference2D     difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 12 differences found
 dataset: </g1/reference3D> and </g1/reference3D>
 size:           [2]           [2]
-position                                        difference          
+position        reference3D     reference3D     difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 size:           [2]           [2]
-position                                        difference          
+position        reference3D     reference3D     difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 size:           [2]           [2]
-position                                        difference          
+position        reference3D     reference3D     difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 size:           [2]           [2]
-position                                        difference          
+position        reference3D     reference3D     difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 size:           [2]           [2]
-position                                        difference          
+position        reference3D     reference3D     difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 size:           [2]           [2]
-position                                        difference          
+position        reference3D     reference3D     difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 size:           [2]           [2]
-position                                        difference          
+position        reference3D     reference3D     difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 size:           [2]           [2]
-position                                        difference          
+position        reference3D     reference3D     difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 size:           [2]           [2]
-position                                        difference          
+position        reference3D     reference3D     difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 size:           [2]           [2]
-position                                        difference          
+position        reference3D     reference3D     difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 size:           [2]           [2]
-position                                        difference          
+position        reference3D     reference3D     difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 size:           [2]           [2]
-position                                        difference          
+position        reference3D     reference3D     difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 size:           [2]           [2]
-position                                        difference          
+position        reference3D     reference3D     difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 size:           [2]           [2]
-position                                        difference          
+position        reference3D     reference3D     difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 size:           [2]           [2]
-position                                        difference          
+position        reference3D     reference3D     difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 size:           [2]           [2]
-position                                        difference          
+position        reference3D     reference3D     difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 size:           [2]           [2]
-position                                        difference          
+position        reference3D     reference3D     difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 size:           [2]           [2]
-position                                        difference          
+position        reference3D     reference3D     difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 size:           [2]           [2]
-position                                        difference          
+position        reference3D     reference3D     difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 size:           [2]           [2]
-position                                        difference          
+position        reference3D     reference3D     difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 size:           [2]           [2]
-position                                        difference          
+position        reference3D     reference3D     difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 size:           [2]           [2]
-position                                        difference          
+position        reference3D     reference3D     difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 size:           [2]           [2]
-position                                        difference          
+position        reference3D     reference3D     difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 size:           [2]           [2]
-position                                        difference          
+position        reference3D     reference3D     difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
diff --git a/tools/test/h5diff/testfiles/h5diff_eps.txt b/tools/test/h5diff/testfiles/h5diff_eps.txt
new file mode 100644
index 0000000..ef48cb6
--- /dev/null
+++ b/tools/test/h5diff/testfiles/h5diff_eps.txt
@@ -0,0 +1,17 @@
+file1: diff_eps1.h5
+file2: diff_eps2.h5
+
+file1     file2
+---------------------------------------
+    x      x    /              
+    x      x    /DS1           
+
+
+group  : </> and </>
+0 differences found
+Attributes status:  0 common, 0 only in obj1, 0 only in obj2
+
+dataset: </DS1> and </DS1>
+0 differences found
+Attributes status:  0 common, 0 only in obj1, 0 only in obj2
+EXIT CODE: 0
diff --git a/tools/test/h5diff/testh5diff.sh.in b/tools/test/h5diff/testh5diff.sh.in
index 557d2ff..6175b2a 100644
--- a/tools/test/h5diff/testh5diff.sh.in
+++ b/tools/test/h5diff/testh5diff.sh.in
@@ -85,6 +85,7 @@ $SRC_H5DIFF_TESTFILES/h5diff_attr2.h5
 $SRC_H5DIFF_TESTFILES/h5diff_attr3.h5
 $SRC_H5DIFF_TESTFILES/h5diff_dset1.h5
 $SRC_H5DIFF_TESTFILES/h5diff_dset2.h5
+$SRC_H5DIFF_TESTFILES/h5diff_dset3.h5
 $SRC_H5DIFF_TESTFILES/h5diff_hyper1.h5
 $SRC_H5DIFF_TESTFILES/h5diff_hyper2.h5
 $SRC_H5DIFF_TESTFILES/h5diff_empty.h5
@@ -121,6 +122,8 @@ $SRC_H5DIFF_TESTFILES/non_comparables1.h5
 $SRC_H5DIFF_TESTFILES/non_comparables2.h5
 $SRC_H5DIFF_TESTFILES/diff_strings1.h5
 $SRC_H5DIFF_TESTFILES/diff_strings2.h5
+$SRC_H5DIFF_TESTFILES/diff_eps1.h5
+$SRC_H5DIFF_TESTFILES/diff_eps2.h5
 $SRC_TOOLS_TESTFILES/tvlstr.h5
 "
 
@@ -259,6 +262,7 @@ $SRC_H5DIFF_TESTFILES/h5diff_55.txt
 $SRC_H5DIFF_TESTFILES/h5diff_56.txt
 $SRC_H5DIFF_TESTFILES/h5diff_57.txt
 $SRC_H5DIFF_TESTFILES/h5diff_58.txt
+$SRC_H5DIFF_TESTFILES/h5diff_58_ref.txt
 $SRC_H5DIFF_TESTFILES/h5diff_59.txt
 $SRC_H5DIFF_TESTFILES/h5diff_500.txt
 $SRC_H5DIFF_TESTFILES/h5diff_501.txt
@@ -335,13 +339,17 @@ $SRC_H5DIFF_TESTFILES/h5diff_708.txt
 $SRC_H5DIFF_TESTFILES/h5diff_709.txt
 $SRC_H5DIFF_TESTFILES/h5diff_710.txt
 $SRC_H5DIFF_TESTFILES/h5diff_80.txt
+$SRC_H5DIFF_TESTFILES/h5diff_800.txt
+$SRC_H5DIFF_TESTFILES/h5diff_801.txt
 $SRC_H5DIFF_TESTFILES/h5diff_90.txt
 $SRC_H5DIFF_TESTFILES/h5diff_8625.txt
 $SRC_H5DIFF_TESTFILES/h5diff_8639.txt
+$SRC_H5DIFF_TESTFILES/h5diff_reg.txt
 $SRC_H5DIFF_TESTFILES/h5diff_v1.txt
 $SRC_H5DIFF_TESTFILES/h5diff_v2.txt
 $SRC_H5DIFF_TESTFILES/h5diff_v3.txt
 $SRC_H5DIFF_TESTFILES/h5diff_vlstr.txt
+$SRC_H5DIFF_TESTFILES/h5diff_eps.txt
 "
 
 #
@@ -691,7 +699,8 @@ TOOLTEST h5diff_56.txt -v h5diff_dtypes.h5 h5diff_dtypes.h5 dset6a dset6b
 TOOLTEST h5diff_57.txt -v h5diff_dtypes.h5 h5diff_dtypes.h5 dset7a dset7b
 
 # 5.8 (region reference)
-TOOLTEST h5diff_58.txt -v h5diff_dset1.h5 h5diff_dset2.h5 refreg
+TOOLTEST h5diff_58.txt -v2 h5diff_dset1.h5 h5diff_dset2.h5 refreg
+TOOLTEST h5diff_58_ref.txt -v2 h5diff_dset1.h5 h5diff_dset2.h5 /g1/reference2D
 
 # test for both dset and attr with same type but with different size
 # ( HDDFV-7942 )
@@ -745,6 +754,9 @@ TOOLTEST h5diff_609.txt -d 200 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dse
 # 6.10: number smaller than smallest difference
 TOOLTEST h5diff_610.txt -d 1 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4
 
+# eps: number smaller than epsilon
+TOOLTEST h5diff_eps.txt -v3 -d 1e-16 diff_eps1.h5 diff_eps2.h5
+
 
 # ##############################################################################
 # # -p
@@ -1166,6 +1178,12 @@ TOOLTEST h5diff_645.txt -v -p 0.05 --use-system-epsilon h5diff_basic1.h5 h5diff_
 TOOLTEST h5diff_646.txt -v --use-system-epsilon -p 0.05 h5diff_basic1.h5 h5diff_basic2.h5 /g1/dset3 /g1/dset4
 
 # ##############################################################################
+# # Test array variances
+# ##############################################################################
+TOOLTEST h5diff_800.txt -v h5diff_dset1.h5 h5diff_dset2.h5 /g1/array /g1/array
+TOOLTEST h5diff_801.txt -v h5diff_dset1.h5 h5diff_dset3.h5 /g1/array /g1/array
+
+# ##############################################################################
 # VDS tests
 # ##############################################################################
 TOOLTEST h5diff_v1.txt -v 1_vds.h5 2_vds.h5
diff --git a/tools/test/h5dump/CMakeLists.txt b/tools/test/h5dump/CMakeLists.txt
index cfc542f..8a83699 100644
--- a/tools/test/h5dump/CMakeLists.txt
+++ b/tools/test/h5dump/CMakeLists.txt
@@ -35,7 +35,7 @@ endif ()
 # --------------------------------------------------------------------
 if (HDF5_BUILD_GENERATORS AND NOT ONLY_SHARED_LIBS)
   add_executable (h5dumpgentest ${HDF5_TOOLS_TEST_H5DUMP_SOURCE_DIR}/h5dumpgentest.c)
-  target_include_directories (h5dumpgentest PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  target_include_directories (h5dumpgentest PRIVATE "${HDF5_SRC_DIR};${HDF5_TEST_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
   TARGET_C_PROPERTIES (h5dumpgentest STATIC)
   target_link_libraries (h5dumpgentest PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
   set_target_properties (h5dumpgentest PROPERTIES FOLDER generator/tools)
diff --git a/tools/test/h5dump/Makefile.am b/tools/test/h5dump/Makefile.am
index a7a2bcb..21560fb 100644
--- a/tools/test/h5dump/Makefile.am
+++ b/tools/test/h5dump/Makefile.am
@@ -19,7 +19,7 @@
 include $(top_srcdir)/config/commence.am
 
 # Include files in /src directory and /tools/lib directory
-AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
+AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib
 
 # Test programs and scripts
 TEST_PROG=h5dumpgentest
diff --git a/tools/test/h5dump/h5dumpgentest.c b/tools/test/h5dump/h5dumpgentest.c
index 966d613..bce3493 100644
--- a/tools/test/h5dump/h5dumpgentest.c
+++ b/tools/test/h5dump/h5dumpgentest.c
@@ -22,7 +22,7 @@
  */
 
 #include "hdf5.h"
-#include "H5private.h"
+#include "h5test.h"
 #include "h5tools.h"
 
 #define FILE1 "tgroup.h5"
@@ -462,10 +462,23 @@ gent_dataset(void)
 {
     hid_t fid, dataset, space;
     hsize_t dims[2];
-    int dset1[10][20];
-    double dset2[30][20];
+    int     **dset1         = NULL;
+    int     *dset1_data     = NULL;
+    double  **dset2         = NULL;
+    double  *dset2_data     = NULL;
     int i, j;
 
+    /* Set up data arrays */
+    dset1_data = (int *)HDcalloc(10 * 20, sizeof(int));
+    dset1 = (int **)HDcalloc(10, sizeof(dset1_data));
+    for (i = 0; i < 10; i++)
+        dset1[i] = dset1_data + (i * 20);
+
+    dset2_data = (double *)HDcalloc(30 * 20, sizeof(double));
+    dset2 = (double **)HDcalloc(30, sizeof(dset2_data));
+    for (i = 0; i < 30; i++)
+        dset2[i] = dset2_data + (i * 20);
+
     fid = H5Fcreate(FILE2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
     /* dset1 */
@@ -477,7 +490,7 @@ gent_dataset(void)
         for(j = 0; j < 20; j++)
             dset1[i][j] = j + i;
 
-    H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset1);
+    H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset1_data);
     H5Sclose(space);
     H5Dclose(dataset);
 
@@ -490,11 +503,16 @@ gent_dataset(void)
         for(j = 0; j < 20; j++)
             dset2[i][j] = 0.0001F * (float)j + (float)i;
 
-    H5Dwrite(dataset, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset2);
+    H5Dwrite(dataset, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset2_data);
 
     H5Sclose(space);
     H5Dclose(dataset);
     H5Fclose(fid);
+
+    HDfree(dset1);
+    HDfree(dset1_data);
+    HDfree(dset2);
+    HDfree(dset2_data);
 }
 
 static void
@@ -1553,7 +1571,7 @@ gent_many(void)
     dset1_t dset1[6];
 
     hsize_t dim[4];
-    herr_t ret;
+    herr_t H5_ATTR_NDEBUG_UNUSED ret;
 
     fid = H5Fcreate(FILE12, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
@@ -1772,9 +1790,17 @@ static void gent_str(void) {
             int a[8][10];
             char s[12][33];
     } compound_t;
-    compound_t comp1[3][6];
+
+    compound_t  **comp1     = NULL;
+    compound_t  *comp1_data = NULL;
     hsize_t mdims[2];
 
+    /* Set up data array */
+    comp1_data = (compound_t *)HDcalloc(3 * 6, sizeof(compound_t));
+    comp1 = (compound_t **)HDcalloc(3, sizeof(comp1_data));
+    for (i = 0; i < 3; i++)
+        comp1[i] = comp1_data + (i * 6);
+
     fid = H5Fcreate(FILE13, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
     /* string 1 : nullterm string */
@@ -1860,7 +1886,7 @@ static void gent_str(void) {
         }
 
     dataset = H5Dcreate2(fid, "/comp1", f_type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    H5Dwrite(dataset, f_type2, H5S_ALL, H5S_ALL, H5P_DEFAULT, comp1);
+    H5Dwrite(dataset, f_type2, H5S_ALL, H5S_ALL, H5P_DEFAULT, comp1_data);
 
     H5Tclose(f_type);
     H5Tclose(f_type2);
@@ -1868,6 +1894,9 @@ static void gent_str(void) {
     H5Dclose(dataset);
 
     H5Fclose(fid);
+
+    HDfree(comp1);
+    HDfree(comp1_data);
 }
 
 /*
@@ -2602,7 +2631,7 @@ static void gent_vldatatypes(void)
     hid_t file, dset, space, type;
     hsize_t dims[] = { SPACE1_DIM1 };
     int i;
-    herr_t ret=0;
+    herr_t H5_ATTR_NDEBUG_UNUSED ret=0;
 
     file = H5Fcreate(FILE21, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
@@ -2697,7 +2726,7 @@ gent_vldatatypes2(void)
     hid_t  tid1, tid2; /* Datatype IDs         */
     hsize_t  dims1[] = {SPACE1_DIM1};
     unsigned       i,j,k;      /* counting variables */
-    herr_t  ret;  /* Generic return value  */
+    herr_t  H5_ATTR_NDEBUG_UNUSED ret;  /* Generic return value  */
 
     /* Allocate and initialize VL data to write */
     for(i = 0; i < SPACE1_DIM1; i++) {
@@ -2770,7 +2799,7 @@ static void gent_vldatatypes3(void)
     hid_t  tid1, tid2; /* Datatype IDs         */
     hsize_t  dims1[] = {SPACE1_DIM1};
     unsigned       i,j;        /* counting variables */
-    herr_t  ret;  /* Generic return value  */
+    herr_t  H5_ATTR_NDEBUG_UNUSED ret;  /* Generic return value  */
 
     /* Allocate and initialize VL data to write */
     for(i=0; i<SPACE1_DIM1; i++) {
@@ -2839,7 +2868,7 @@ static void gent_vldatatypes4(void)
     hid_t  tid1, tid2; /* Datatype IDs         */
     hsize_t  dims1[] = {SPACE1_DIM1};
     unsigned       i,j;        /* counting variables */
-    herr_t  ret;  /* Generic return value  */
+    herr_t  H5_ATTR_NDEBUG_UNUSED ret;  /* Generic return value  */
 
     /* Allocate and initialize VL data to write */
     for(i=0; i<SPACE1_DIM1; i++) {
@@ -2896,14 +2925,14 @@ static void gent_vldatatypes4(void)
 /* Generate a variable-length dataset with NULL values in it */
 static void gent_vldatatypes5(void)
 {
-    hvl_t wdata [SPACE1_DIM1];
-    hid_t  fid1;
-    hid_t  dataset;
-    hid_t  sid1;
-    hid_t  tid1;
-    hsize_t  dims1[] = {SPACE1_DIM1};
-    int                 i,j;          /* counting variable */
-    herr_t  ret;  /* Generic return value  */
+    hvl_t   wdata [SPACE1_DIM1];
+    hid_t   fid1;
+    hid_t   dataset;
+    hid_t   sid1;
+    hid_t   tid1;
+    hsize_t dims1[] = {SPACE1_DIM1};
+    int     i,j;          /* counting variable */
+    herr_t  H5_ATTR_NDEBUG_UNUSED ret;  /* Generic return value  */
 
     /* initialize data for dataset */
     for(i=0; i<SPACE1_DIM1; i++) {
@@ -2965,16 +2994,15 @@ static void gent_vldatatypes5(void)
 
 static void gent_array1_big(void)
 {
-    int *wdata;   /* Information to write */
-    hid_t  fid1;  /* HDF5 File IDs  */
-    hid_t  dataset; /* Dataset ID   */
-    hid_t  sid1;       /* Dataspace ID   */
-    hid_t  tid1;       /* Datatype ID   */
-    hsize_t  sdims1[] = {SPACE_ARRAY1BIG_DIM};
-    hsize_t  tdims1[] = {ARRAY1BIG_DIM};
-    int        i,j;        /* counting variables */
-    herr_t  ret;  /* Generic return value  */
-
+    int    *wdata;   /* Information to write */
+    hid_t   fid1;  /* HDF5 File IDs  */
+    hid_t   dataset; /* Dataset ID   */
+    hid_t   sid1;       /* Dataspace ID   */
+    hid_t   tid1;       /* Datatype ID   */
+    hsize_t sdims1[] = {SPACE_ARRAY1BIG_DIM};
+    hsize_t tdims1[] = {ARRAY1BIG_DIM};
+    int     i,j;        /* counting variables */
+    herr_t  H5_ATTR_NDEBUG_UNUSED ret;  /* Generic return value  */
 
     /* for region reference dataset */
     hid_t  dset2;
@@ -3064,7 +3092,7 @@ static void gent_array1(void)
     hsize_t  sdims1[] = {SPACE1_DIM1};
     hsize_t  tdims1[] = {ARRAY1_DIM1};
     int        i,j;        /* counting variables */
-    herr_t  ret;  /* Generic return value  */
+    herr_t  ret H5_ATTR_NDEBUG_UNUSED;  /* Generic return value  */
 
     /* Allocate and initialize array data to write */
     for(i=0; i<SPACE1_DIM1; i++)
@@ -3100,15 +3128,15 @@ static void gent_array1(void)
 
 static void gent_array2(void)
 {
-    int wdata[SPACE1_DIM1][ARRAY2_DIM1][ARRAY2_DIM2][ARRAY2_DIM3];   /* Information to write */
-    hid_t  fid;        /* HDF5 File IDs  */
-    hid_t  dataset; /* Dataset ID   */
-    hid_t  sid;        /* Dataspace ID   */
-    hid_t  tid;        /* Datatype ID   */
-    hsize_t  sdims1[] = {SPACE1_DIM1};
-    hsize_t  tdims2[] = {ARRAY2_DIM1,ARRAY2_DIM2,ARRAY2_DIM3};
-    int        i,j,k,l;    /* counting variables */
-    herr_t  ret;  /* Generic return value  */
+    int     wdata[SPACE1_DIM1][ARRAY2_DIM1][ARRAY2_DIM2][ARRAY2_DIM3];   /* Information to write */
+    hid_t   fid;        /* HDF5 File IDs  */
+    hid_t   dataset; /* Dataset ID   */
+    hid_t   sid;        /* Dataspace ID   */
+    hid_t   tid;        /* Datatype ID   */
+    hsize_t sdims1[] = {SPACE1_DIM1};
+    hsize_t tdims2[] = {ARRAY2_DIM1,ARRAY2_DIM2,ARRAY2_DIM3};
+    int     i,j,k,l;    /* counting variables */
+    herr_t  H5_ATTR_NDEBUG_UNUSED ret;  /* Generic return value  */
 
     /* Allocate and initialize array data to write */
     for(i=0; i<SPACE1_DIM1; i++)
@@ -3146,17 +3174,17 @@ static void gent_array2(void)
 
 static void gent_array3(void)
 {
-    int wdata[SPACE1_DIM1][ARRAY1_DIM1][ARRAY3_DIM1][ARRAY3_DIM2];   /* Information to write */
-    hid_t  fid;        /* HDF5 File IDs  */
-    hid_t  dataset; /* Dataset ID   */
-    hid_t  sid;        /* Dataspace ID   */
-    hid_t  tid1;       /* 1-D array Datatype ID */
-    hid_t  tid2;       /* 2-D array Datatype ID */
-    hsize_t  sdims1[] = {SPACE1_DIM1};
-    hsize_t  tdims1[] = {ARRAY1_DIM1};
-    hsize_t  tdims2[] = {ARRAY3_DIM1,ARRAY3_DIM2};
-    int        i,j,k,l;    /* counting variables */
-    herr_t  ret;  /* Generic return value  */
+    int     wdata[SPACE1_DIM1][ARRAY1_DIM1][ARRAY3_DIM1][ARRAY3_DIM2];   /* Information to write */
+    hid_t   fid;        /* HDF5 File IDs  */
+    hid_t   dataset; /* Dataset ID   */
+    hid_t   sid;        /* Dataspace ID   */
+    hid_t   tid1;       /* 1-D array Datatype ID */
+    hid_t   tid2;       /* 2-D array Datatype ID */
+    hsize_t sdims1[] = {SPACE1_DIM1};
+    hsize_t tdims1[] = {ARRAY1_DIM1};
+    hsize_t tdims2[] = {ARRAY3_DIM1,ARRAY3_DIM2};
+    int     i,j,k,l;    /* counting variables */
+    herr_t  H5_ATTR_NDEBUG_UNUSED ret;  /* Generic return value  */
 
     /* Allocate and initialize array data to write */
     for(i=0; i<SPACE1_DIM1; i++)
@@ -3203,16 +3231,16 @@ static void gent_array4(void)
             int i;
             float f;
     } s2_t;
-    s2_t wdata[SPACE1_DIM1][ARRAY1_DIM1];   /* Information to write */
-    hid_t  fid1;  /* HDF5 File IDs  */
-    hid_t  dataset; /* Dataset ID   */
-    hid_t  sid1;       /* Dataspace ID   */
-    hid_t  tid1;       /* Array Datatype ID   */
-    hid_t  tid2;       /* Compound Datatype ID   */
-    hsize_t  sdims1[] = {SPACE1_DIM1};
-    hsize_t  tdims1[] = {ARRAY1_DIM1};
-    int        i,j;        /* counting variables */
-    herr_t  ret;  /* Generic return value  */
+    s2_t    wdata[SPACE1_DIM1][ARRAY1_DIM1];   /* Information to write */
+    hid_t   fid1;  /* HDF5 File IDs  */
+    hid_t   dataset; /* Dataset ID   */
+    hid_t   sid1;       /* Dataspace ID   */
+    hid_t   tid1;       /* Array Datatype ID   */
+    hid_t   tid2;       /* Compound Datatype ID   */
+    hsize_t sdims1[] = {SPACE1_DIM1};
+    hsize_t tdims1[] = {ARRAY1_DIM1};
+    int     i,j;        /* counting variables */
+    herr_t  H5_ATTR_NDEBUG_UNUSED ret;  /* Generic return value  */
 
     /* Initialize array data to write */
     for(i=0; i<SPACE1_DIM1; i++)
@@ -3269,17 +3297,17 @@ static void gent_array5(void)
             int i;
             float f[ARRAY1_DIM1];
     } s2_t;
-    s2_t wdata[SPACE1_DIM1][ARRAY1_DIM1];   /* Information to write */
-    hid_t  fid1;  /* HDF5 File IDs  */
-    hid_t  dataset; /* Dataset ID   */
-    hid_t  sid1;       /* Dataspace ID   */
-    hid_t  tid1;       /* Array Datatype ID */
-    hid_t  tid2;       /* Compound Datatype ID */
-    hid_t  tid3;       /* Nested Array Datatype ID */
-    hsize_t  sdims1[] = {SPACE1_DIM1};
-    hsize_t  tdims1[] = {ARRAY1_DIM1};
-    int        i,j,k;      /* counting variables */
-    herr_t  ret;  /* Generic return value  */
+    s2_t    wdata[SPACE1_DIM1][ARRAY1_DIM1];   /* Information to write */
+    hid_t   fid1;  /* HDF5 File IDs  */
+    hid_t   dataset; /* Dataset ID   */
+    hid_t   sid1;       /* Dataspace ID   */
+    hid_t   tid1;       /* Array Datatype ID */
+    hid_t   tid2;       /* Compound Datatype ID */
+    hid_t   tid3;       /* Nested Array Datatype ID */
+    hsize_t sdims1[] = {SPACE1_DIM1};
+    hsize_t tdims1[] = {ARRAY1_DIM1};
+    int     i,j,k;      /* counting variables */
+    herr_t  H5_ATTR_NDEBUG_UNUSED ret;  /* Generic return value  */
 
     /* Initialize array data to write */
     for(i=0; i<SPACE1_DIM1; i++)
@@ -3340,16 +3368,16 @@ static void gent_array5(void)
 
 static void gent_array6(void)
 {
-    hvl_t wdata[SPACE1_DIM1][ARRAY1_DIM1];   /* Information to write */
-    hid_t  fid1;  /* HDF5 File IDs  */
-    hid_t  dataset; /* Dataset ID   */
-    hid_t  sid1;       /* Dataspace ID   */
-    hid_t  tid1;       /* Array Datatype ID   */
-    hid_t  tid2;       /* VL Datatype ID       */
-    hsize_t  sdims1[] = {SPACE1_DIM1};
-    hsize_t  tdims1[] = {ARRAY1_DIM1};
-    int        i,j,k;      /* counting variables */
-    herr_t  ret;  /* Generic return value  */
+    hvl_t   wdata[SPACE1_DIM1][ARRAY1_DIM1];   /* Information to write */
+    hid_t   fid1;  /* HDF5 File IDs  */
+    hid_t   dataset; /* Dataset ID   */
+    hid_t   sid1;       /* Dataspace ID   */
+    hid_t   tid1;       /* Array Datatype ID   */
+    hid_t   tid2;       /* VL Datatype ID       */
+    hsize_t sdims1[] = {SPACE1_DIM1};
+    hsize_t tdims1[] = {ARRAY1_DIM1};
+    int     i,j,k;      /* counting variables */
+    herr_t  H5_ATTR_NDEBUG_UNUSED ret;  /* Generic return value  */
 
     /* Initialize array data to write */
     for(i=0; i<SPACE1_DIM1; i++)
@@ -3400,17 +3428,17 @@ static void gent_array6(void)
 
 static void gent_array7(void)
 {
-    hvl_t wdata[SPACE1_DIM1][ARRAY1_DIM1];   /* Information to write */
-    hid_t  fid1;  /* HDF5 File IDs  */
-    hid_t  dataset; /* Dataset ID   */
-    hid_t  sid1;       /* Dataspace ID   */
-    hid_t  tid1;       /* Array Datatype ID   */
-    hid_t  tid2;       /* VL Datatype ID       */
-    hid_t  tid3;       /* Nested Array Datatype ID   */
-    hsize_t  sdims1[] = {SPACE1_DIM1};
-    hsize_t  tdims1[] = {ARRAY1_DIM1};
-    int        i,j,k,l;    /* Index variables */
-    herr_t  ret;  /* Generic return value  */
+    hvl_t   wdata[SPACE1_DIM1][ARRAY1_DIM1];   /* Information to write */
+    hid_t   fid1;  /* HDF5 File IDs  */
+    hid_t   dataset; /* Dataset ID   */
+    hid_t   sid1;       /* Dataspace ID   */
+    hid_t   tid1;       /* Array Datatype ID   */
+    hid_t   tid2;       /* VL Datatype ID       */
+    hid_t   tid3;       /* Nested Array Datatype ID   */
+    hsize_t sdims1[] = {SPACE1_DIM1};
+    hsize_t tdims1[] = {ARRAY1_DIM1};
+    int     i,j,k,l;    /* Index variables */
+    herr_t  H5_ATTR_NDEBUG_UNUSED ret;  /* Generic return value  */
 
     /* Initialize array data to write */
     for(i=0; i<SPACE1_DIM1; i++)
@@ -3474,7 +3502,7 @@ static void gent_array8(void)
     hid_t       filetype = H5I_INVALID_HID; /* Handles */
     hid_t       space = H5I_INVALID_HID; /* Handles */
     hid_t       dset = H5I_INVALID_HID; /* Handles */
-    herr_t      status = -1;
+    herr_t      H5_ATTR_NDEBUG_UNUSED status = -1;
     hsize_t sdims[] = {F64_DIM0};
     hsize_t tdims[] = {F64_DIM1};
     int         *wdata;      /* Write buffer */
@@ -3541,7 +3569,7 @@ static void gent_empty(void)
     } empty_struct;
     hid_t file, dset, space, type;
     hsize_t dims[] = { SPACE1_DIM1 };
-    herr_t ret=0;
+    herr_t H5_ATTR_NDEBUG_UNUSED ret=0;
 
     file = H5Fcreate(FILE32, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
@@ -3599,7 +3627,9 @@ static void gent_empty(void)
 static void
 gent_group_comments(void)
 {
-    hid_t fid, group;
+    hid_t fid = H5I_INVALID_HID;
+    hid_t group = H5I_INVALID_HID;
+    hbool_t supports_comments = FALSE;
 
     fid = H5Fcreate(FILE33, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
@@ -3747,9 +3777,15 @@ void gent_multi(void)
     H5FD_mem_t mt, memb_map[H5FD_MEM_NTYPES];
     hid_t memb_fapl[H5FD_MEM_NTYPES];
     const char *memb_name[H5FD_MEM_NTYPES];
-    char sv[H5FD_MEM_NTYPES][1024];
+    char **sv = NULL;
+    char *sv_data = NULL;
     haddr_t memb_addr[H5FD_MEM_NTYPES];
 
+    sv_data = (char *)HDcalloc(H5FD_MEM_NTYPES * 1024, sizeof(char));
+    sv = (char **)HDcalloc(H5FD_MEM_NTYPES, sizeof(sv_data));
+    for (i = 0; i < H5FD_MEM_NTYPES; i++)
+        sv[i] = sv_data + (i * 1024);
+
     fapl = H5Pcreate(H5P_FILE_ACCESS);
 
     HDmemset(memb_map, 0, sizeof memb_map);
@@ -3790,6 +3826,9 @@ void gent_multi(void)
     H5Dclose(dataset);
     H5Fclose(fid);
     H5Pclose(fapl);
+
+    HDfree(sv);
+    HDfree(sv_data);
 }
 
 static void gent_large_objname(void)
@@ -3929,7 +3968,7 @@ static void write_attr_in(hid_t loc_id,
     hid_t   aid;
     hid_t   sid;
     hid_t   tid;
-    herr_t  status;
+    herr_t  H5_ATTR_NDEBUG_UNUSED status;
     int     val, i, j, k, n;
     float   f;
 
@@ -4370,7 +4409,7 @@ static void write_dset_in(hid_t loc_id,
     hid_t   sid;
     hid_t   tid;
     hid_t   plist_id;
-    herr_t  status;
+    herr_t  H5_ATTR_NDEBUG_UNUSED status;
     int     val, i, j, k, n;
     float   f;
     int     fillvalue=2;
@@ -4808,7 +4847,7 @@ static void gent_attr_all(void)
     hid_t   root_id;
     hid_t   sid;
     hsize_t dims[1] = {2};
-    herr_t  status;
+    herr_t  H5_ATTR_NDEBUG_UNUSED status;
 
     /* Create a file and a dataset */
     fid = H5Fcreate(FILE40, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
@@ -4966,7 +5005,7 @@ static void gent_compound_complex(void)
     hid_t      array4_tid;                /* Array datatype handle    */
     hid_t      datafile, dataset;         /* Datafile/dataset handles */
     hid_t      dataspace;                 /* Dataspace handle         */
-    herr_t     status;                    /* Error checking variable */
+    herr_t     H5_ATTR_NDEBUG_UNUSED status;   /* Error checking variable */
     hsize_t    dim[] = {F41_LENGTH};          /* Dataspace dimensions     */
     hsize_t    array_dimb[] = {F41_DIMb};     /* Array dimensions         */
     hsize_t    array_dimd[]={F41_ARRAY_DIMd1,F41_ARRAY_DIMd2}; /* Array dimensions         */
@@ -5115,7 +5154,7 @@ static void gent_named_dtype_attr(void)
     hid_t aid;
     hid_t gid;
     int data=8;
-    herr_t ret;
+    herr_t H5_ATTR_NDEBUG_UNUSED ret;
 
     /* Create a file */
     fid=H5Fcreate(FILE42, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
@@ -5337,7 +5376,7 @@ make_external(hid_t fid)
     hsize_t cur_size[1];  /*data space current size */
     hsize_t max_size[1];  /*data space maximum size */
     hsize_t size;         /*bytes reserved for data in the external file*/
-    int     ret;
+    int     H5_ATTR_NDEBUG_UNUSED ret;
 
     cur_size[0] = max_size[0] = 100;
     size = (max_size[0]*sizeof(int)/2);
@@ -5385,7 +5424,8 @@ static void gent_filters(void)
     hsize_t  dims1[RANK]      = {DIM1,DIM2};
     hsize_t  chunk_dims[RANK] = {CDIM1,CDIM2};
     int      buf1[DIM1][DIM2];
-    int      i, j, n, ret;
+    int      i, j, n;
+    int H5_ATTR_NDEBUG_UNUSED ret;
 
     for(i=n=0; i<DIM1; i++){
         for(j=0; j<DIM2; j++){
@@ -5731,8 +5771,7 @@ static void gent_fcontents(void)
     hid_t    tid;   /* datatype ID */
     hsize_t  dims[1]={4};
     int      buf[4]={1,2,3,4};
-    int      ret;
-
+    int      H5_ATTR_NDEBUG_UNUSED ret;
 
     /* create a file */
     fid  = H5Fcreate(FILE46, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
@@ -5865,7 +5904,7 @@ static void gent_fvalues(void)
     hvl_t      fillval3;                       /* vlen fill value */
     hsize_t    dimarray[1]={3};                /* array dimension */
     int        buf4[2][3]= {{1,2,3},{4,5,6}};  /* array */
-    int        ret;
+    int        H5_ATTR_NDEBUG_UNUSED ret;
 
     /* create a file */
     fid  = H5Fcreate(FILE48, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
@@ -6023,9 +6062,9 @@ static void gent_string(void)
     c_t      buf3 = {24, "Four score and seven\n years ago our forefathers brought forth on this continent a new nation"};
     char     buf4[] = {"Four score and seven\n years ago our forefathers brought forth on this continent a new nation"};
     hsize_t  dims1[]  = {1};
-    hsize_t        dims2[]  = {SPACE1_DIM1};
-    hsize_t        dims4[1];
-    int      ret;
+    hsize_t  dims2[]  = {SPACE1_DIM1};
+    hsize_t  dims4[1];
+    int      H5_ATTR_NDEBUG_UNUSED ret;
 
     dims4[0] = sizeof(buf4);
 
@@ -6120,7 +6159,8 @@ static void gent_aindices(void)
     int      buf2[10][10];
     int      buf3[2][10][10];
     int      buf4[2][2][10][10];
-    int      i, j, k, l, n, ret;
+    int      i, j, k, l, n;
+    int      H5_ATTR_NDEBUG_UNUSED ret;
 
     for(i = n = 0; i < 100; i++)
         buf1[i] = n++;
@@ -6187,11 +6227,11 @@ static void gent_aindices(void)
  */
 static void gent_longlinks(void)
 {
-    hid_t       fid = (-1);     /* File ID */
-    hid_t       gid = (-1);     /* Group ID */
-    hid_t       gid2 = (-1);    /* Datatype ID */
-    char               *objname = NULL; /* Name of object [Long] */
-    size_t              u;              /* Local index variable */
+    hid_t       fid = (-1);      /* File ID */
+    hid_t       gid = (-1);      /* Group ID */
+    hid_t       H5_ATTR_NDEBUG_UNUSED gid2 = (-1);     /* Datatype ID */
+    char        *objname = NULL; /* Name of object [Long] */
+    size_t      u;               /* Local index variable */
 
     /* Create files */
     fid = H5Fcreate(FILE51, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
@@ -6368,7 +6408,7 @@ gent_bigdims(void)
     hsize_t i;
     char    c;
     size_t  nelmts;
-    int     ret;
+    int     H5_ATTR_NDEBUG_UNUSED ret;
 
     /* create a file */
     fid  = H5Fcreate(FILE56, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
@@ -6464,7 +6504,8 @@ gent_hyperslab(void)
     hid_t    fid;     /* file id */
     hsize_t  dims[2]  = {32,4097}; /* big enough data size to force a second stripmine read */
     double   *buf;
-    int      i, ret;
+    int      i;
+    int      H5_ATTR_NDEBUG_UNUSED ret;
 
     buf = (double*) HDmalloc(32 * 4097 * sizeof(double) );
     for(i = 0; i < 32 * 4097; i++)
@@ -7090,7 +7131,8 @@ gent_dataset_idx(void)
     hsize_t dims[2];
     hsize_t maxdims[2];
     int buf[20][10];
-    int i, j, ret;
+    int i, j;
+    int H5_ATTR_NDEBUG_UNUSED ret;
 
     /* Get a copy of the file aaccess property */
     fapl = H5Pcreate(H5P_FILE_ACCESS);
@@ -7168,19 +7210,43 @@ gent_dataset_idx(void)
 static void
 gent_packedbits(void)
 {
-    hid_t fid, dataset, space;
+    hid_t fid       = H5I_INVALID_HID;
+    hid_t dataset   = H5I_INVALID_HID;
+    hid_t space     = H5I_INVALID_HID;
     hsize_t dims[2];
-    uint8_t  dsetu8[F66_XDIM][F66_YDIM8],   valu8bits;
-    uint16_t dsetu16[F66_XDIM][F66_YDIM16], valu16bits;
-    uint32_t dsetu32[F66_XDIM][F66_YDIM32], valu32bits;
-    uint64_t dsetu64[F66_XDIM][F66_YDIM64], valu64bits;
-    int8_t  dset8[F66_XDIM][F66_YDIM8],   val8bits;
-    int16_t dset16[F66_XDIM][F66_YDIM16], val16bits;
-    int32_t dset32[F66_XDIM][F66_YDIM32], val32bits;
-    int64_t dset64[F66_XDIM][F66_YDIM64], val64bits;
-    double  dsetdbl[F66_XDIM][F66_YDIM8];
+
+    uint8_t     **dsetu8    = NULL;
+    uint16_t    **dsetu16   = NULL;
+    uint32_t    **dsetu32   = NULL;
+    uint64_t    **dsetu64   = NULL;
+    int8_t      **dset8     = NULL;
+    int16_t     **dset16    = NULL;
+    int32_t     **dset32    = NULL;
+    int64_t     **dset64    = NULL;
+    double      **dsetdbl   = NULL;
+
+    uint8_t     valu8bits;
+    uint16_t    valu16bits;
+    uint32_t    valu32bits;
+    uint64_t    valu64bits;
+    int8_t      val8bits;
+    int16_t     val16bits;
+    int32_t     val32bits;
+    int64_t     val64bits;
+
     unsigned int i, j;
 
+    /* Create arrays */
+    H5TEST_ALLOCATE_2D_ARRAY(dsetu8,  uint8_t,  F66_XDIM, F66_YDIM8);
+    H5TEST_ALLOCATE_2D_ARRAY(dsetu16, uint16_t, F66_XDIM, F66_YDIM16);
+    H5TEST_ALLOCATE_2D_ARRAY(dsetu32, uint32_t, F66_XDIM, F66_YDIM32);
+    H5TEST_ALLOCATE_2D_ARRAY(dsetu64, uint64_t, F66_XDIM, F66_YDIM64);
+    H5TEST_ALLOCATE_2D_ARRAY(dset8,   int8_t,   F66_XDIM, F66_YDIM8);
+    H5TEST_ALLOCATE_2D_ARRAY(dset16,  int16_t,  F66_XDIM, F66_YDIM16);
+    H5TEST_ALLOCATE_2D_ARRAY(dset32,  int32_t,  F66_XDIM, F66_YDIM32);
+    H5TEST_ALLOCATE_2D_ARRAY(dset64,  int64_t,  F66_XDIM, F66_YDIM64);
+    H5TEST_ALLOCATE_2D_ARRAY(dsetdbl, double,   F66_XDIM, F66_YDIM8);
+
     fid = H5Fcreate(FILE66, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
     /* Dataset of 8 bits unsigned int */
@@ -7196,7 +7262,7 @@ gent_packedbits(void)
         valu8bits = (uint8_t)(valu8bits << 1);
     }
 
-    H5Dwrite(dataset, H5T_NATIVE_UINT8, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetu8);
+    H5Dwrite(dataset, H5T_NATIVE_UINT8, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetu8[0]);
     H5Sclose(space);
     H5Dclose(dataset);
 
@@ -7213,7 +7279,7 @@ gent_packedbits(void)
         valu16bits = (uint16_t)(valu16bits << 1);
     }
 
-    H5Dwrite(dataset, H5T_NATIVE_UINT16, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetu16);
+    H5Dwrite(dataset, H5T_NATIVE_UINT16, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetu16[0]);
     H5Sclose(space);
     H5Dclose(dataset);
 
@@ -7230,7 +7296,7 @@ gent_packedbits(void)
         valu32bits <<= 1;
     }
 
-    H5Dwrite(dataset, H5T_NATIVE_UINT32, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetu32);
+    H5Dwrite(dataset, H5T_NATIVE_UINT32, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetu32[0]);
     H5Sclose(space);
     H5Dclose(dataset);
 
@@ -7247,7 +7313,7 @@ gent_packedbits(void)
         valu64bits <<= 1;
     }
 
-    H5Dwrite(dataset, H5T_NATIVE_UINT64, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetu64);
+    H5Dwrite(dataset, H5T_NATIVE_UINT64, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetu64[0]);
     H5Sclose(space);
     H5Dclose(dataset);
 
@@ -7264,7 +7330,7 @@ gent_packedbits(void)
         val8bits = (int8_t)(val8bits << 1);
     }
 
-    H5Dwrite(dataset, H5T_NATIVE_INT8, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset8);
+    H5Dwrite(dataset, H5T_NATIVE_INT8, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset8[0]);
     H5Sclose(space);
     H5Dclose(dataset);
 
@@ -7281,7 +7347,7 @@ gent_packedbits(void)
         val16bits = (int16_t)(val16bits << 1);
     }
 
-    H5Dwrite(dataset, H5T_NATIVE_INT16, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset16);
+    H5Dwrite(dataset, H5T_NATIVE_INT16, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset16[0]);
     H5Sclose(space);
     H5Dclose(dataset);
 
@@ -7298,7 +7364,7 @@ gent_packedbits(void)
         val32bits <<= 1;
     }
 
-    H5Dwrite(dataset, H5T_NATIVE_INT32, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset32);
+    H5Dwrite(dataset, H5T_NATIVE_INT32, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset32[0]);
     H5Sclose(space);
     H5Dclose(dataset);
 
@@ -7315,7 +7381,7 @@ gent_packedbits(void)
         val64bits <<= 1;
     }
 
-    H5Dwrite(dataset, H5T_NATIVE_INT64, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset64);
+    H5Dwrite(dataset, H5T_NATIVE_INT64, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset64[0]);
     H5Sclose(space);
     H5Dclose(dataset);
 
@@ -7328,11 +7394,21 @@ gent_packedbits(void)
         for(j = 0; j < dims[1]; j++)
             dsetdbl[i][j] = 0.0001F * (float)j + (float)i;
 
-    H5Dwrite(dataset, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetdbl);
+    H5Dwrite(dataset, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetdbl[0]);
 
     H5Sclose(space);
     H5Dclose(dataset);
     H5Fclose(fid);
+
+    HDfree(dsetu8);
+    HDfree(dsetu16);
+    HDfree(dsetu32);
+    HDfree(dsetu64);
+    HDfree(dset8);
+    HDfree(dset16);
+    HDfree(dset32);
+    HDfree(dset64);
+    HDfree(dsetdbl);
 }
 
 /*-------------------------------------------------------------------------
@@ -7349,19 +7425,44 @@ gent_packedbits(void)
 static void
 gent_attr_intsize(void)
 {
-    hid_t fid, attr, space, root;
+    hid_t fid   = H5I_INVALID_HID;
+    hid_t attr  = H5I_INVALID_HID;
+    hid_t space = H5I_INVALID_HID;
+    hid_t root  = H5I_INVALID_HID;
     hsize_t dims[2];
-    uint8_t  dsetu8[F66_XDIM][F66_YDIM8],   valu8bits;
-    uint16_t dsetu16[F66_XDIM][F66_YDIM16], valu16bits;
-    uint32_t dsetu32[F66_XDIM][F66_YDIM32], valu32bits;
-    uint64_t dsetu64[F66_XDIM][F66_YDIM64], valu64bits;
-    int8_t  dset8[F66_XDIM][F66_YDIM8],   val8bits;
-    int16_t dset16[F66_XDIM][F66_YDIM16], val16bits;
-    int32_t dset32[F66_XDIM][F66_YDIM32], val32bits;
-    int64_t dset64[F66_XDIM][F66_YDIM64], val64bits;
-    double  dsetdbl[F66_XDIM][F66_YDIM8];
+
+    uint8_t     **dsetu8    = NULL;
+    uint16_t    **dsetu16   = NULL;
+    uint32_t    **dsetu32   = NULL;
+    uint64_t    **dsetu64   = NULL;
+    int8_t      **dset8     = NULL;
+    int16_t     **dset16    = NULL;
+    int32_t     **dset32    = NULL;
+    int64_t     **dset64    = NULL;
+    double      **dsetdbl   = NULL;
+
+    uint8_t     valu8bits;
+    uint16_t    valu16bits;
+    uint32_t    valu32bits;
+    uint64_t    valu64bits;
+    int8_t      val8bits;
+    int16_t     val16bits;
+    int32_t     val32bits;
+    int64_t     val64bits;
+
     unsigned int i, j;
 
+    /* Create arrays */
+    H5TEST_ALLOCATE_2D_ARRAY(dsetu8,  uint8_t,  F66_XDIM, F66_YDIM8);
+    H5TEST_ALLOCATE_2D_ARRAY(dsetu16, uint16_t, F66_XDIM, F66_YDIM16);
+    H5TEST_ALLOCATE_2D_ARRAY(dsetu32, uint32_t, F66_XDIM, F66_YDIM32);
+    H5TEST_ALLOCATE_2D_ARRAY(dsetu64, uint64_t, F66_XDIM, F66_YDIM64);
+    H5TEST_ALLOCATE_2D_ARRAY(dset8,   int8_t,   F66_XDIM, F66_YDIM8);
+    H5TEST_ALLOCATE_2D_ARRAY(dset16,  int16_t,  F66_XDIM, F66_YDIM16);
+    H5TEST_ALLOCATE_2D_ARRAY(dset32,  int32_t,  F66_XDIM, F66_YDIM32);
+    H5TEST_ALLOCATE_2D_ARRAY(dset64,  int64_t,  F66_XDIM, F66_YDIM64);
+    H5TEST_ALLOCATE_2D_ARRAY(dsetdbl, double,   F66_XDIM, F66_YDIM8);
+
     fid = H5Fcreate(FILE69, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     root = H5Gopen2(fid, "/", H5P_DEFAULT);
 
@@ -7379,7 +7480,7 @@ gent_attr_intsize(void)
         valu8bits = (uint8_t)(valu8bits << 1);
     }
 
-    H5Awrite(attr, H5T_NATIVE_UINT8, dsetu8);
+    H5Awrite(attr, H5T_NATIVE_UINT8, dsetu8[0]);
     H5Sclose(space);
     H5Aclose(attr);
 
@@ -7397,7 +7498,7 @@ gent_attr_intsize(void)
         valu16bits = (uint16_t)(valu16bits << 1);
     }
 
-    H5Awrite(attr, H5T_NATIVE_UINT16, dsetu16);
+    H5Awrite(attr, H5T_NATIVE_UINT16, dsetu16[0]);
     H5Sclose(space);
     H5Aclose(attr);
 
@@ -7415,7 +7516,7 @@ gent_attr_intsize(void)
         valu32bits <<= 1;
     }
 
-    H5Awrite(attr, H5T_NATIVE_UINT32, dsetu32);
+    H5Awrite(attr, H5T_NATIVE_UINT32, dsetu32[0]);
     H5Sclose(space);
     H5Aclose(attr);
 
@@ -7433,7 +7534,7 @@ gent_attr_intsize(void)
         valu64bits <<= 1;
     }
 
-    H5Awrite(attr, H5T_NATIVE_UINT64, dsetu64);
+    H5Awrite(attr, H5T_NATIVE_UINT64, dsetu64[0]);
     H5Sclose(space);
     H5Aclose(attr);
 
@@ -7451,7 +7552,7 @@ gent_attr_intsize(void)
         val8bits = (int8_t)(val8bits << 1);
     }
 
-    H5Awrite(attr, H5T_NATIVE_INT8, dset8);
+    H5Awrite(attr, H5T_NATIVE_INT8, dset8[0]);
     H5Sclose(space);
     H5Aclose(attr);
 
@@ -7469,7 +7570,7 @@ gent_attr_intsize(void)
         val16bits = (int16_t)(val16bits << 1);
     }
 
-    H5Awrite(attr, H5T_NATIVE_INT16, dset16);
+    H5Awrite(attr, H5T_NATIVE_INT16, dset16[0]);
     H5Sclose(space);
     H5Aclose(attr);
 
@@ -7487,7 +7588,7 @@ gent_attr_intsize(void)
         val32bits <<= 1;
     }
 
-    H5Awrite(attr, H5T_NATIVE_INT32, dset32);
+    H5Awrite(attr, H5T_NATIVE_INT32, dset32[0]);
     H5Sclose(space);
     H5Aclose(attr);
 
@@ -7505,7 +7606,7 @@ gent_attr_intsize(void)
         val64bits <<= 1;
     }
 
-    H5Awrite(attr, H5T_NATIVE_INT64, dset64);
+    H5Awrite(attr, H5T_NATIVE_INT64, dset64[0]);
     H5Sclose(space);
     H5Aclose(attr);
 
@@ -7518,13 +7619,23 @@ gent_attr_intsize(void)
         for(j = 0; j < dims[1]; j++)
             dsetdbl[i][j] = 0.0001F * (float)j + (float)i;
 
-    H5Awrite(attr, H5T_NATIVE_DOUBLE, dsetdbl);
+    H5Awrite(attr, H5T_NATIVE_DOUBLE, dsetdbl[0]);
 
     H5Sclose(space);
     H5Aclose(attr);
 
     H5Gclose(root);
     H5Fclose(fid);
+
+    HDfree(dsetu8);
+    HDfree(dsetu16);
+    HDfree(dsetu32);
+    HDfree(dsetu64);
+    HDfree(dset8);
+    HDfree(dset16);
+    HDfree(dset32);
+    HDfree(dset64);
+    HDfree(dsetdbl);
 }
 
 static void
@@ -7615,7 +7726,7 @@ static void
 gent_charsets(void)
 {
     hid_t fid, did, sid;
-    herr_t status;
+    herr_t H5_ATTR_NDEBUG_UNUSED status;
     hsize_t dim[] = {1}; /* Dataspace dimensions */
     typedef struct CharSetInfo {
             const char *ascii_p_;
@@ -7689,7 +7800,7 @@ static void gent_compound_intsizes(void) {
     Array1Struct *Array1;
 
     hid_t Array1Structid; /* File datatype identifier */
-    herr_t status; /* Error checking variable */
+    herr_t H5_ATTR_NDEBUG_UNUSED status; /* Error checking variable */
     hsize_t dim[] = { F70_LENGTH }; /* Dataspace dimensions     */
 
     int m, n, o; /* Array init loop vars     */
@@ -7959,14 +8070,16 @@ static void gent_compound_attr_intsizes(void) {
             int64_t dset64[F70_XDIM][F70_YDIM64];
             double  dsetdbl[F70_XDIM][F70_YDIM8];
     } Array1Struct;
-    Array1Struct Array1[F70_LENGTH];
+    Array1Struct *Array1 = NULL;
 
     hid_t Array1Structid; /* File datatype identifier */
-    herr_t status; /* Error checking variable */
+    herr_t H5_ATTR_NDEBUG_UNUSED status; /* Error checking variable */
     hsize_t dim[] = { F70_LENGTH }; /* Dataspace dimensions     */
 
     int m, n, o; /* Array init loop vars     */
 
+    Array1 = (Array1Struct *)HDcalloc(F70_LENGTH, sizeof(Array1Struct));
+
     /* Initialize the data in the arrays/datastructure                */
     for (m = 0; m < F70_LENGTH; m++) {
 
@@ -8198,6 +8311,8 @@ static void gent_compound_attr_intsizes(void) {
 
     status = H5Fclose(fid);
     HDassert(status >= 0);
+
+    HDfree(Array1);
 }
 
 static void gent_nested_compound_dt(void) {       /* test nested data type */
@@ -8362,19 +8477,44 @@ static void gent_nested_compound_dt(void) {       /* test nested data type */
 static void
 gent_intscalars(void)
 {
-    hid_t fid, dataset, space, tid;
+    hid_t fid       = H5I_INVALID_HID;
+    hid_t dataset   = H5I_INVALID_HID;
+    hid_t space     = H5I_INVALID_HID;
+    hid_t tid       = H5I_INVALID_HID;
     hsize_t dims[2];
-    uint8_t  dsetu8[F73_XDIM][F73_YDIM8],   valu8bits;
-    uint16_t dsetu16[F73_XDIM][F73_YDIM16], valu16bits;
-    uint32_t dsetu32[F73_XDIM][F73_YDIM32], valu32bits;
-    uint64_t dsetu64[F73_XDIM][F73_YDIM64], valu64bits;
-    int8_t  dset8[F73_XDIM][F73_YDIM8],   val8bits;
-    int16_t dset16[F73_XDIM][F73_YDIM16], val16bits;
-    int32_t dset32[F73_XDIM][F73_YDIM32], val32bits;
-    int64_t dset64[F73_XDIM][F73_YDIM64], val64bits;
-    double  dsetdbl[F73_XDIM][F73_YDIM8];
+
+    uint8_t     **dsetu8    = NULL;
+    uint16_t    **dsetu16   = NULL;
+    uint32_t    **dsetu32   = NULL;
+    uint64_t    **dsetu64   = NULL;
+    int8_t      **dset8     = NULL;
+    int16_t     **dset16    = NULL;
+    int32_t     **dset32    = NULL;
+    int64_t     **dset64    = NULL;
+    double      **dsetdbl   = NULL;
+
+    uint8_t     valu8bits;
+    uint16_t    valu16bits;
+    uint32_t    valu32bits;
+    uint64_t    valu64bits;
+    int8_t      val8bits;
+    int16_t     val16bits;
+    int32_t     val32bits;
+    int64_t     val64bits;
+
     unsigned int i, j;
 
+    /* Create arrays */
+    H5TEST_ALLOCATE_2D_ARRAY(dsetu8,  uint8_t,  F73_XDIM, F73_YDIM8);
+    H5TEST_ALLOCATE_2D_ARRAY(dsetu16, uint16_t, F73_XDIM, F73_YDIM16);
+    H5TEST_ALLOCATE_2D_ARRAY(dsetu32, uint32_t, F73_XDIM, F73_YDIM32);
+    H5TEST_ALLOCATE_2D_ARRAY(dsetu64, uint64_t, F73_XDIM, F73_YDIM64);
+    H5TEST_ALLOCATE_2D_ARRAY(dset8,   int8_t,   F73_XDIM, F73_YDIM8);
+    H5TEST_ALLOCATE_2D_ARRAY(dset16,  int16_t,  F73_XDIM, F73_YDIM16);
+    H5TEST_ALLOCATE_2D_ARRAY(dset32,  int32_t,  F73_XDIM, F73_YDIM32);
+    H5TEST_ALLOCATE_2D_ARRAY(dset64,  int64_t,  F73_XDIM, F73_YDIM64);
+    H5TEST_ALLOCATE_2D_ARRAY(dsetdbl, double,   F73_XDIM, F73_YDIM8);
+
     fid = H5Fcreate(FILE73, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
     /* Dataset of 8 bits unsigned int */
@@ -8392,7 +8532,7 @@ gent_intscalars(void)
         valu8bits = (uint8_t)(valu8bits << 1);
     }
 
-    H5Dwrite(dataset, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetu8);
+    H5Dwrite(dataset, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetu8[0]);
     H5Sclose(space);
     H5Dclose(dataset);
 
@@ -8411,7 +8551,7 @@ gent_intscalars(void)
         valu16bits = (uint16_t)(valu16bits << 1);
     }
 
-    H5Dwrite(dataset, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetu16);
+    H5Dwrite(dataset, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetu16[0]);
     H5Sclose(space);
     H5Dclose(dataset);
 
@@ -8430,7 +8570,7 @@ gent_intscalars(void)
         valu32bits <<= 1;
     }
 
-    H5Dwrite(dataset, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetu32);
+    H5Dwrite(dataset, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetu32[0]);
     H5Sclose(space);
     H5Dclose(dataset);
 
@@ -8449,7 +8589,7 @@ gent_intscalars(void)
         valu64bits <<= 1;
     }
 
-    H5Dwrite(dataset, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetu64);
+    H5Dwrite(dataset, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetu64[0]);
     H5Sclose(space);
     H5Dclose(dataset);
 
@@ -8468,7 +8608,7 @@ gent_intscalars(void)
         val8bits = (int8_t)(val8bits << 1);
     }
 
-    H5Dwrite(dataset, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset8);
+    H5Dwrite(dataset, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset8[0]);
     H5Sclose(space);
     H5Dclose(dataset);
 
@@ -8487,7 +8627,7 @@ gent_intscalars(void)
         val16bits = (int16_t)(val16bits << 1);
     }
 
-    H5Dwrite(dataset, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset16);
+    H5Dwrite(dataset, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset16[0]);
     H5Sclose(space);
     H5Dclose(dataset);
 
@@ -8506,7 +8646,7 @@ gent_intscalars(void)
         val32bits <<= 1;
     }
 
-    H5Dwrite(dataset, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset32);
+    H5Dwrite(dataset, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset32[0]);
     H5Sclose(space);
     H5Dclose(dataset);
 
@@ -8525,7 +8665,7 @@ gent_intscalars(void)
         val64bits <<= 1;
     }
 
-    H5Dwrite(dataset, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset64);
+    H5Dwrite(dataset, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset64[0]);
     H5Sclose(space);
     H5Dclose(dataset);
 
@@ -8539,11 +8679,21 @@ gent_intscalars(void)
         for(j = 0; j < dims[1]; j++)
             dsetdbl[i][j] = 0.0001F * (float)j + (float)i;
 
-    H5Dwrite(dataset, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetdbl);
+    H5Dwrite(dataset, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetdbl[0]);
 
     H5Sclose(space);
     H5Dclose(dataset);
     H5Fclose(fid);
+
+    HDfree(dsetu8);
+    HDfree(dsetu16);
+    HDfree(dsetu32);
+    HDfree(dsetu64);
+    HDfree(dset8);
+    HDfree(dset16);
+    HDfree(dset32);
+    HDfree(dset64);
+    HDfree(dsetdbl);
 }
 
 /*-------------------------------------------------------------------------
@@ -8560,19 +8710,46 @@ gent_intscalars(void)
 static void
 gent_attr_intscalars(void)
 {
-    hid_t fid, attr, space, root, tid;
+    hid_t fid   = H5I_INVALID_HID;
+    hid_t attr  = H5I_INVALID_HID;
+    hid_t space = H5I_INVALID_HID;
+    hid_t root  = H5I_INVALID_HID;
+    hid_t tid   = H5I_INVALID_HID;
     hsize_t dims[2];
-    uint8_t  dsetu8[F73_XDIM][F73_YDIM8],   valu8bits;
-    uint16_t dsetu16[F73_XDIM][F73_YDIM16], valu16bits;
-    uint32_t dsetu32[F73_XDIM][F73_YDIM32], valu32bits;
-    uint64_t dsetu64[F73_XDIM][F73_YDIM64], valu64bits;
-    int8_t  dset8[F73_XDIM][F73_YDIM8],   val8bits;
-    int16_t dset16[F73_XDIM][F73_YDIM16], val16bits;
-    int32_t dset32[F73_XDIM][F73_YDIM32], val32bits;
-    int64_t dset64[F73_XDIM][F73_YDIM64], val64bits;
-    double  dsetdbl[F73_XDIM][F73_YDIM8];
+
+
+    uint8_t     **dsetu8    = NULL;
+    uint16_t    **dsetu16   = NULL;
+    uint32_t    **dsetu32   = NULL;
+    uint64_t    **dsetu64   = NULL;
+    int8_t      **dset8     = NULL;
+    int16_t     **dset16    = NULL;
+    int32_t     **dset32    = NULL;
+    int64_t     **dset64    = NULL;
+    double      **dsetdbl   = NULL;
+
+    uint8_t     valu8bits;
+    uint16_t    valu16bits;
+    uint32_t    valu32bits;
+    uint64_t    valu64bits;
+    int8_t      val8bits;
+    int16_t     val16bits;
+    int32_t     val32bits;
+    int64_t     val64bits;
+
     unsigned int i, j;
 
+    /* Create arrays */
+    H5TEST_ALLOCATE_2D_ARRAY(dsetu8,  uint8_t,  F73_XDIM, F73_YDIM8);
+    H5TEST_ALLOCATE_2D_ARRAY(dsetu16, uint16_t, F73_XDIM, F73_YDIM16);
+    H5TEST_ALLOCATE_2D_ARRAY(dsetu32, uint32_t, F73_XDIM, F73_YDIM32);
+    H5TEST_ALLOCATE_2D_ARRAY(dsetu64, uint64_t, F73_XDIM, F73_YDIM64);
+    H5TEST_ALLOCATE_2D_ARRAY(dset8,   int8_t,   F73_XDIM, F73_YDIM8);
+    H5TEST_ALLOCATE_2D_ARRAY(dset16,  int16_t,  F73_XDIM, F73_YDIM16);
+    H5TEST_ALLOCATE_2D_ARRAY(dset32,  int32_t,  F73_XDIM, F73_YDIM32);
+    H5TEST_ALLOCATE_2D_ARRAY(dset64,  int64_t,  F73_XDIM, F73_YDIM64);
+    H5TEST_ALLOCATE_2D_ARRAY(dsetdbl, double,   F73_XDIM, F73_YDIM8);
+
     fid = H5Fcreate(FILE74, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     root = H5Gopen2(fid, "/", H5P_DEFAULT);
 
@@ -8591,7 +8768,7 @@ gent_attr_intscalars(void)
         valu8bits = (uint8_t)(valu8bits << 1);
     }
 
-    H5Awrite(attr, tid, dsetu8);
+    H5Awrite(attr, tid, dsetu8[0]);
     H5Sclose(space);
     H5Aclose(attr);
 
@@ -8610,7 +8787,7 @@ gent_attr_intscalars(void)
         valu16bits = (uint16_t)(valu16bits << 1);
     }
 
-    H5Awrite(attr, tid, dsetu16);
+    H5Awrite(attr, tid, dsetu16[0]);
     H5Sclose(space);
     H5Aclose(attr);
 
@@ -8629,7 +8806,7 @@ gent_attr_intscalars(void)
         valu32bits <<= 1;
     }
 
-    H5Awrite(attr, tid, dsetu32);
+    H5Awrite(attr, tid, dsetu32[0]);
     H5Sclose(space);
     H5Aclose(attr);
 
@@ -8648,7 +8825,7 @@ gent_attr_intscalars(void)
         valu64bits <<= 1;
     }
 
-    H5Awrite(attr, tid, dsetu64);
+    H5Awrite(attr, tid, dsetu64[0]);
     H5Sclose(space);
     H5Aclose(attr);
 
@@ -8667,7 +8844,7 @@ gent_attr_intscalars(void)
         val8bits = (int8_t)(val8bits << 1);
     }
 
-    H5Awrite(attr, tid, dset8);
+    H5Awrite(attr, tid, dset8[0]);
     H5Sclose(space);
     H5Aclose(attr);
 
@@ -8686,7 +8863,7 @@ gent_attr_intscalars(void)
         val16bits = (int16_t)(val16bits << 1);
     }
 
-    H5Awrite(attr, tid, dset16);
+    H5Awrite(attr, tid, dset16[0]);
     H5Sclose(space);
     H5Aclose(attr);
 
@@ -8705,7 +8882,7 @@ gent_attr_intscalars(void)
         val32bits <<= 1;
     }
 
-    H5Awrite(attr, tid, dset32);
+    H5Awrite(attr, tid, dset32[0]);
     H5Sclose(space);
     H5Aclose(attr);
 
@@ -8724,7 +8901,7 @@ gent_attr_intscalars(void)
         val64bits <<= 1;
     }
 
-    H5Awrite(attr, tid, dset64);
+    H5Awrite(attr, tid, dset64[0]);
     H5Sclose(space);
     H5Aclose(attr);
 
@@ -8738,13 +8915,23 @@ gent_attr_intscalars(void)
         for(j = 0; j < dims[1]; j++)
             dsetdbl[i][j] = 0.0001F * (float)j + (float)i;
 
-    H5Awrite(attr, tid, dsetdbl);
+    H5Awrite(attr, tid, dsetdbl[0]);
 
     H5Sclose(space);
     H5Aclose(attr);
 
     H5Gclose(root);
     H5Fclose(fid);
+
+    HDfree(dsetu8);
+    HDfree(dsetu16);
+    HDfree(dsetu32);
+    HDfree(dsetu64);
+    HDfree(dset8);
+    HDfree(dset16);
+    HDfree(dset32);
+    HDfree(dset64);
+    HDfree(dsetdbl);
 }
 
 /*-------------------------------------------------------------------------
@@ -8838,7 +9025,7 @@ static void gent_compound_int_array(void) {
     Cmpd1Struct *Cmpd1;
 
     hid_t Cmpd1Structid; /* File datatype identifier */
-    herr_t status; /* Error checking variable */
+    herr_t H5_ATTR_NDEBUG_UNUSED status; /* Error checking variable */
     hsize_t dim[] = { F76_LENGTH }; /* Dataspace dimensions     */
 
     int m, n; /* Array init loop vars     */
@@ -9094,7 +9281,7 @@ static void gent_compound_ints(void) {
 
     hid_t Cmpd1Structid; /* File datatype identifier */
     hid_t Cmpd2Structid; /* File datatype identifier */
-    herr_t status; /* Error checking variable */
+    herr_t H5_ATTR_NDEBUG_UNUSED status; /* Error checking variable */
     hsize_t dim[] = { F77_LENGTH }; /* Dataspace dimensions     */
 
     int m; /* Array init loop vars     */
@@ -9299,19 +9486,45 @@ static void gent_compound_ints(void) {
 static void
 gent_intattrscalars(void)
 {
-    hid_t fid, attr, dataset, space, tid;
+    hid_t fid       = H5I_INVALID_HID;
+    hid_t attr      = H5I_INVALID_HID;
+    hid_t dataset   = H5I_INVALID_HID;
+    hid_t space     = H5I_INVALID_HID;
+    hid_t tid       = H5I_INVALID_HID;
     hsize_t dims[2];
-    uint8_t  dsetu8[F73_XDIM][F73_YDIM8],   valu8bits;
-    uint16_t dsetu16[F73_XDIM][F73_YDIM16], valu16bits;
-    uint32_t dsetu32[F73_XDIM][F73_YDIM32], valu32bits;
-    uint64_t dsetu64[F73_XDIM][F73_YDIM64], valu64bits;
-    int8_t  dset8[F73_XDIM][F73_YDIM8],   val8bits;
-    int16_t dset16[F73_XDIM][F73_YDIM16], val16bits;
-    int32_t dset32[F73_XDIM][F73_YDIM32], val32bits;
-    int64_t dset64[F73_XDIM][F73_YDIM64], val64bits;
-    double  dsetdbl[F73_XDIM][F73_YDIM8];
+
+    uint8_t     **dsetu8    = NULL;
+    uint16_t    **dsetu16   = NULL;
+    uint32_t    **dsetu32   = NULL;
+    uint64_t    **dsetu64   = NULL;
+    int8_t      **dset8     = NULL;
+    int16_t     **dset16    = NULL;
+    int32_t     **dset32    = NULL;
+    int64_t     **dset64    = NULL;
+    double      **dsetdbl   = NULL;
+
+    uint8_t     valu8bits;
+    uint16_t    valu16bits;
+    uint32_t    valu32bits;
+    uint64_t    valu64bits;
+    int8_t      val8bits;
+    int16_t     val16bits;
+    int32_t     val32bits;
+    int64_t     val64bits;
+
     unsigned int i, j;
 
+    /* Create arrays */
+    H5TEST_ALLOCATE_2D_ARRAY(dsetu8,  uint8_t,  F73_XDIM, F73_YDIM8);
+    H5TEST_ALLOCATE_2D_ARRAY(dsetu16, uint16_t, F73_XDIM, F73_YDIM16);
+    H5TEST_ALLOCATE_2D_ARRAY(dsetu32, uint32_t, F73_XDIM, F73_YDIM32);
+    H5TEST_ALLOCATE_2D_ARRAY(dsetu64, uint64_t, F73_XDIM, F73_YDIM64);
+    H5TEST_ALLOCATE_2D_ARRAY(dset8,   int8_t,   F73_XDIM, F73_YDIM8);
+    H5TEST_ALLOCATE_2D_ARRAY(dset16,  int16_t,  F73_XDIM, F73_YDIM16);
+    H5TEST_ALLOCATE_2D_ARRAY(dset32,  int32_t,  F73_XDIM, F73_YDIM32);
+    H5TEST_ALLOCATE_2D_ARRAY(dset64,  int64_t,  F73_XDIM, F73_YDIM64);
+    H5TEST_ALLOCATE_2D_ARRAY(dsetdbl, double,   F73_XDIM, F73_YDIM8);
+
     fid = H5Fcreate(FILE78, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
     /* Dataset of 8 bits unsigned int */
@@ -9332,7 +9545,7 @@ gent_intattrscalars(void)
     H5Dwrite(dataset, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetu8);
     /* Attribute of 8 bits unsigned int */
     attr = H5Acreate2(dataset, F73_DATASETU08, tid, space, H5P_DEFAULT, H5P_DEFAULT);
-    H5Awrite(attr, tid, dsetu8);
+    H5Awrite(attr, tid, dsetu8[0]);
     H5Aclose(attr);
     H5Sclose(space);
     H5Dclose(dataset);
@@ -9355,7 +9568,7 @@ gent_intattrscalars(void)
     H5Dwrite(dataset, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetu16);
     /* Attribute of 16 bits unsigned int */
     attr = H5Acreate2(dataset, F73_DATASETU16, tid, space, H5P_DEFAULT, H5P_DEFAULT);
-    H5Awrite(attr, tid, dsetu16);
+    H5Awrite(attr, tid, dsetu16[0]);
     H5Aclose(attr);
     H5Sclose(space);
     H5Dclose(dataset);
@@ -9378,7 +9591,7 @@ gent_intattrscalars(void)
     H5Dwrite(dataset, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetu32);
     /* Attribute of 32 bits unsigned int */
     attr = H5Acreate2(dataset, F73_DATASETU32, tid, space, H5P_DEFAULT, H5P_DEFAULT);
-    H5Awrite(attr, tid, dsetu32);
+    H5Awrite(attr, tid, dsetu32[0]);
     H5Aclose(attr);
     H5Sclose(space);
     H5Dclose(dataset);
@@ -9401,7 +9614,7 @@ gent_intattrscalars(void)
     H5Dwrite(dataset, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetu64);
     /* Attribute of 64 bits unsigned int */
     attr = H5Acreate2(dataset, F73_DATASETU64, tid, space, H5P_DEFAULT, H5P_DEFAULT);
-    H5Awrite(attr, tid, dsetu64);
+    H5Awrite(attr, tid, dsetu64[0]);
     H5Aclose(attr);
     H5Sclose(space);
     H5Dclose(dataset);
@@ -9424,7 +9637,7 @@ gent_intattrscalars(void)
     H5Dwrite(dataset, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset8);
     /* Attribute of 8 bits signed int */
     attr = H5Acreate2(dataset, F73_DATASETS08, tid, space, H5P_DEFAULT, H5P_DEFAULT);
-    H5Awrite(attr, tid, dset8);
+    H5Awrite(attr, tid, dset8[0]);
     H5Aclose(attr);
     H5Sclose(space);
     H5Dclose(dataset);
@@ -9447,7 +9660,7 @@ gent_intattrscalars(void)
     H5Dwrite(dataset, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset16);
     /* Attribute of 16 bits signed int */
     attr = H5Acreate2(dataset, F73_DATASETS16, tid, space, H5P_DEFAULT, H5P_DEFAULT);
-    H5Awrite(attr, tid, dset16);
+    H5Awrite(attr, tid, dset16[0]);
     H5Aclose(attr);
     H5Sclose(space);
     H5Dclose(dataset);
@@ -9470,7 +9683,7 @@ gent_intattrscalars(void)
     H5Dwrite(dataset, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset32);
     /* Attribute of 32 bits signed int */
     attr = H5Acreate2(dataset, F73_DATASETS32, tid, space, H5P_DEFAULT, H5P_DEFAULT);
-    H5Awrite(attr, tid, dset32);
+    H5Awrite(attr, tid, dset32[0]);
     H5Aclose(attr);
     H5Sclose(space);
     H5Dclose(dataset);
@@ -9493,7 +9706,7 @@ gent_intattrscalars(void)
     H5Dwrite(dataset, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset64);
     /* Attribute of 64 bits signed int */
     attr = H5Acreate2(dataset, F73_DATASETS64, tid, space, H5P_DEFAULT, H5P_DEFAULT);
-    H5Awrite(attr, tid, dset64);
+    H5Awrite(attr, tid, dset64[0]);
     H5Aclose(attr);
     H5Sclose(space);
     H5Dclose(dataset);
@@ -9511,11 +9724,22 @@ gent_intattrscalars(void)
     H5Dwrite(dataset, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetdbl);
     /* Attribute of double */
     attr = H5Acreate2(dataset, F73_DUMMYDBL, tid, space, H5P_DEFAULT, H5P_DEFAULT);
-    H5Awrite(attr, tid, dsetdbl);
+    H5Awrite(attr, tid, dsetdbl[0]);
+
     H5Aclose(attr);
     H5Sclose(space);
     H5Dclose(dataset);
     H5Fclose(fid);
+
+    HDfree(dsetu8);
+    HDfree(dsetu16);
+    HDfree(dsetu32);
+    HDfree(dsetu64);
+    HDfree(dset8);
+    HDfree(dset16);
+    HDfree(dset32);
+    HDfree(dset64);
+    HDfree(dsetdbl);
 }
 
 /*-------------------------------------------------------------------------
@@ -9531,19 +9755,66 @@ gent_intattrscalars(void)
 static void
 gent_intsattrs(void)
 {
-    hid_t fid, attr, dataset, space, aspace;
+    hid_t fid       = H5I_INVALID_HID;
+    hid_t attr      = H5I_INVALID_HID;
+    hid_t dataset   = H5I_INVALID_HID;
+    hid_t space     = H5I_INVALID_HID;
+    hid_t aspace    = H5I_INVALID_HID;
     hsize_t dims[2], adims[1];
-    uint8_t  dsetu8[F66_XDIM][F66_YDIM8],   asetu8[F66_XDIM*F66_YDIM8],   valu8bits;
-    uint16_t dsetu16[F66_XDIM][F66_YDIM16], asetu16[F66_XDIM*F66_YDIM16], valu16bits;
-    uint32_t dsetu32[F66_XDIM][F66_YDIM32], asetu32[F66_XDIM*F66_YDIM32], valu32bits;
-    uint64_t dsetu64[F66_XDIM][F66_YDIM64], asetu64[F66_XDIM*F66_YDIM64], valu64bits;
-    int8_t  dset8[F66_XDIM][F66_YDIM8],   aset8[F66_XDIM*F66_YDIM8],   val8bits;
-    int16_t dset16[F66_XDIM][F66_YDIM16], aset16[F66_XDIM*F66_YDIM16], val16bits;
-    int32_t dset32[F66_XDIM][F66_YDIM32], aset32[F66_XDIM*F66_YDIM32], val32bits;
-    int64_t dset64[F66_XDIM][F66_YDIM64], aset64[F66_XDIM*F66_YDIM64], val64bits;
-    double  dsetdbl[F66_XDIM][F66_YDIM8], asetdbl[F66_XDIM*F66_YDIM8];
+
+
+    uint8_t     **dsetu8    = NULL;
+    uint16_t    **dsetu16   = NULL;
+    uint32_t    **dsetu32   = NULL;
+    uint64_t    **dsetu64   = NULL;
+    int8_t      **dset8     = NULL;
+    int16_t     **dset16    = NULL;
+    int32_t     **dset32    = NULL;
+    int64_t     **dset64    = NULL;
+    double      **dsetdbl   = NULL;
+
+    uint8_t     *asetu8     = NULL;
+    uint16_t    *asetu16    = NULL;
+    uint32_t    *asetu32    = NULL;
+    uint64_t    *asetu64    = NULL;
+    int8_t      *aset8      = NULL;
+    int16_t     *aset16     = NULL;
+    int32_t     *aset32     = NULL;
+    int64_t     *aset64     = NULL;
+    double      *asetdbl    = NULL;
+
+    uint8_t     valu8bits;
+    uint16_t    valu16bits;
+    uint32_t    valu32bits;
+    uint64_t    valu64bits;
+    int8_t      val8bits;
+    int16_t     val16bits;
+    int32_t     val32bits;
+    int64_t     val64bits;
+
     unsigned int i, j;
 
+    /* Create arrays */
+    H5TEST_ALLOCATE_2D_ARRAY(dsetu8,  uint8_t,  F66_XDIM, F66_YDIM8);
+    H5TEST_ALLOCATE_2D_ARRAY(dsetu16, uint16_t, F66_XDIM, F66_YDIM16);
+    H5TEST_ALLOCATE_2D_ARRAY(dsetu32, uint32_t, F66_XDIM, F66_YDIM32);
+    H5TEST_ALLOCATE_2D_ARRAY(dsetu64, uint64_t, F66_XDIM, F66_YDIM64);
+    H5TEST_ALLOCATE_2D_ARRAY(dset8,   int8_t,   F66_XDIM, F66_YDIM8);
+    H5TEST_ALLOCATE_2D_ARRAY(dset16,  int16_t,  F66_XDIM, F66_YDIM16);
+    H5TEST_ALLOCATE_2D_ARRAY(dset32,  int32_t,  F66_XDIM, F66_YDIM32);
+    H5TEST_ALLOCATE_2D_ARRAY(dset64,  int64_t,  F66_XDIM, F66_YDIM64);
+    H5TEST_ALLOCATE_2D_ARRAY(dsetdbl, double,   F66_XDIM, F66_YDIM8);
+
+    asetu8  = HDcalloc(F66_XDIM * F66_YDIM8,  sizeof(uint8_t));
+    asetu16 = HDcalloc(F66_XDIM * F66_YDIM16, sizeof(uint16_t));
+    asetu32 = HDcalloc(F66_XDIM * F66_YDIM32, sizeof(uint32_t));
+    asetu64 = HDcalloc(F66_XDIM * F66_YDIM64, sizeof(uint64_t));
+    aset8   = HDcalloc(F66_XDIM * F66_YDIM8,  sizeof(int8_t));
+    aset16  = HDcalloc(F66_XDIM * F66_YDIM16, sizeof(int16_t));
+    aset32  = HDcalloc(F66_XDIM * F66_YDIM32, sizeof(int32_t));
+    aset64  = HDcalloc(F66_XDIM * F66_YDIM64, sizeof(int64_t));
+    asetdbl = HDcalloc(F66_XDIM * F66_YDIM8,  sizeof(double));
+
     fid = H5Fcreate(FILE79, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
     /* Dataset of 8 bits unsigned int */
@@ -9562,7 +9833,7 @@ gent_intsattrs(void)
         valu8bits = (uint8_t)(valu8bits << 1);
     }
 
-    H5Dwrite(dataset, H5T_NATIVE_UINT8, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetu8);
+    H5Dwrite(dataset, H5T_NATIVE_UINT8, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetu8[0]);
     /* Attribute of 8 bits unsigned int */
     adims[0] = F66_XDIM * F66_YDIM8;
     aspace = H5Screate_simple(1, adims, NULL);
@@ -9589,7 +9860,7 @@ gent_intsattrs(void)
         valu16bits = (uint16_t)(valu16bits << 1);
     }
 
-    H5Dwrite(dataset, H5T_NATIVE_UINT16, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetu16);
+    H5Dwrite(dataset, H5T_NATIVE_UINT16, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetu16[0]);
     /* Attribute of 16 bits unsigned int */
     adims[0] = F66_XDIM * F66_YDIM16;
     aspace = H5Screate_simple(1, adims, NULL);
@@ -9616,7 +9887,7 @@ gent_intsattrs(void)
         valu32bits <<= 1;
     }
 
-    H5Dwrite(dataset, H5T_NATIVE_UINT32, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetu32);
+    H5Dwrite(dataset, H5T_NATIVE_UINT32, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetu32[0]);
     /* Attribute of 32 bits unsigned int */
     adims[0] = F66_XDIM * F66_YDIM32;
     aspace = H5Screate_simple(1, adims, NULL);
@@ -9643,7 +9914,7 @@ gent_intsattrs(void)
         valu64bits <<= 1;
     }
 
-    H5Dwrite(dataset, H5T_NATIVE_UINT64, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetu64);
+    H5Dwrite(dataset, H5T_NATIVE_UINT64, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetu64[0]);
     /* Attribute of 64 bits unsigned int */
     adims[0] = F66_XDIM * F66_YDIM64;
     aspace = H5Screate_simple(1, adims, NULL);
@@ -9670,7 +9941,7 @@ gent_intsattrs(void)
         val8bits = (int8_t)(val8bits << 1);
     }
 
-    H5Dwrite(dataset, H5T_NATIVE_INT8, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset8);
+    H5Dwrite(dataset, H5T_NATIVE_INT8, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset8[0]);
     /* Attribute of 8 bits signed int */
     adims[0] = F66_XDIM * F66_YDIM8;
     aspace = H5Screate_simple(1, adims, NULL);
@@ -9697,7 +9968,7 @@ gent_intsattrs(void)
         val16bits = (int16_t)(val16bits << 1);
     }
 
-    H5Dwrite(dataset, H5T_NATIVE_INT16, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset16);
+    H5Dwrite(dataset, H5T_NATIVE_INT16, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset16[0]);
     /* Attribute of 16 bits signed int */
     adims[0] = F66_XDIM * F66_YDIM16;
     aspace = H5Screate_simple(1, adims, NULL);
@@ -9724,7 +9995,7 @@ gent_intsattrs(void)
         val32bits <<= 1;
     }
 
-    H5Dwrite(dataset, H5T_NATIVE_INT32, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset32);
+    H5Dwrite(dataset, H5T_NATIVE_INT32, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset32[0]);
     /* Attribute of 32 bits signed int */
     adims[0] = F66_XDIM * F66_YDIM32;
     aspace = H5Screate_simple(1, adims, NULL);
@@ -9751,7 +10022,7 @@ gent_intsattrs(void)
         val64bits <<= 1;
     }
 
-    H5Dwrite(dataset, H5T_NATIVE_INT64, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset64);
+    H5Dwrite(dataset, H5T_NATIVE_INT64, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset64[0]);
     /* Attribute of 64 bits signed int */
     adims[0] = F66_XDIM * F66_YDIM64;
     aspace = H5Screate_simple(1, adims, NULL);
@@ -9773,7 +10044,7 @@ gent_intsattrs(void)
             asetdbl[i*dims[1]+j] = dsetdbl[i][j];
         }
 
-    H5Dwrite(dataset, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetdbl);
+    H5Dwrite(dataset, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetdbl[0]);
     /* Attribute of double */
     adims[0] = F66_XDIM * F66_YDIM8;
     aspace = H5Screate_simple(1, adims, NULL);
@@ -9784,6 +10055,26 @@ gent_intsattrs(void)
     H5Sclose(space);
     H5Dclose(dataset);
     H5Fclose(fid);
+
+    HDfree(dsetu8);
+    HDfree(dsetu16);
+    HDfree(dsetu32);
+    HDfree(dsetu64);
+    HDfree(dset8);
+    HDfree(dset16);
+    HDfree(dset32);
+    HDfree(dset64);
+    HDfree(dsetdbl);
+
+    HDfree(asetu8);
+    HDfree(asetu16);
+    HDfree(asetu32);
+    HDfree(asetu64);
+    HDfree(aset8);
+    HDfree(aset16);
+    HDfree(aset32);
+    HDfree(aset64);
+    HDfree(asetdbl);
 }
 
 static void gent_bitnopaquefields(void)
@@ -10396,7 +10687,8 @@ static void gent_udfilter(void)
     hsize_t  dims1[RANK]      = {DIM1,DIM2};
     hsize_t  chunk_dims[RANK] = {CDIM1,CDIM2};
     int      buf1[DIM1][DIM2];
-    int      i, j, n, ret;
+    int      i, j, n;
+    int      H5_ATTR_NDEBUG_UNUSED ret;
 
     for(i=n=0; i<DIM1; i++){
         for(j=0; j<DIM2; j++){
diff --git a/tools/test/h5format_convert/h5fc_chk_idx.c b/tools/test/h5format_convert/h5fc_chk_idx.c
index 570e3a1..2fbbec4 100644
--- a/tools/test/h5format_convert/h5fc_chk_idx.c
+++ b/tools/test/h5format_convert/h5fc_chk_idx.c
@@ -60,7 +60,7 @@ main(int argc, char *argv[])
     dname = HDstrdup(argv[2]);
 
     /* Try opening the file */
-    if((fid = h5tools_fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, (size_t)0)) < 0) {
+    if((fid = h5tools_fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT, FALSE, NULL, (size_t)0)) < 0) {
 	HDfprintf(stderr, "h5fc_chk_idx: unable to open the file\n");
 	HDexit(EXIT_FAILURE);
     } /* end if */
diff --git a/tools/test/h5import/h5importtest.c b/tools/test/h5import/h5importtest.c
index 560f1b3..580530a 100644
--- a/tools/test/h5import/h5importtest.c
+++ b/tools/test/h5import/h5importtest.c
@@ -68,13 +68,12 @@ main(void)
     double    rowi8 = 1.0F, coli8 = 2.0F, plni8 = 5.0F;
 
     /* Initialize machine endian */
-    volatile uint32_t ibyte=0x01234567;
+    volatile uint32_t ibyte = 0x01234567;
     /* 0 for big endian, 1 for little endian. */
-    if ((*((uint8_t*)(&ibyte))) == 0x67)
-        HDstrncpy(machine_order, "LE", 2);
+    if ((*((volatile uint8_t *)(&ibyte))) == 0x67)
+        HDstrcpy(machine_order, "LE");
     else
-        HDstrncpy(machine_order, "BE", 2);
-
+        HDstrcpy(machine_order, "BE");
 
     /*
     * initialize the row, column, and plane vectors
diff --git a/tools/test/h5jam/tellub.c b/tools/test/h5jam/tellub.c
index 2fce729..1cdd289 100644
--- a/tools/test/h5jam/tellub.c
+++ b/tools/test/h5jam/tellub.c
@@ -70,11 +70,11 @@ parse_command_line (int argc, const char *argv[])
         switch ((char) opt) {
             case 'h':
                 usage (h5tools_getprogname());
-                HDexit(EXIT_SUCCESS);
+                h5tools_setstatus(EXIT_SUCCESS);
             case '?':
             default:
                 usage (h5tools_getprogname());
-                HDexit(EXIT_FAILURE);
+                h5tools_setstatus(EXIT_FAILURE);
         }
     }
 
@@ -82,10 +82,17 @@ parse_command_line (int argc, const char *argv[])
     if (argc <= opt_ind) {
         error_msg("missing file name\n");
         usage (h5tools_getprogname());
-        HDexit(EXIT_FAILURE);
+        h5tools_setstatus(EXIT_FAILURE);
     }
 } /* end parse_command_line() */
 
+static void
+leave(int ret)
+{
+   h5tools_close();
+   HDexit(ret);
+}
+
 /*-------------------------------------------------------------------------
  * Function:    main
  *
@@ -98,8 +105,6 @@ int
 main (int argc, const char *argv[])
 {
     char *ifname;
-    void *edata;
-    H5E_auto2_t func;
     hid_t ifile;
     hsize_t usize;
     htri_t testval;
@@ -112,16 +117,16 @@ main (int argc, const char *argv[])
     /* Initialize h5tools lib */
     h5tools_init();
 
-    /* Disable error reporting */
-    H5Eget_auto2(H5E_DEFAULT, &func, &edata);
-    H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
-
     parse_command_line(argc, argv);
 
+    /* enable error reporting if command line option */
+    h5tools_error_report();
+
     if(argc <= (opt_ind)) {
         error_msg("missing file name\n");
         usage (h5tools_getprogname());
-        return EXIT_FAILURE;
+        h5tools_setstatus(EXIT_FAILURE);
+        goto done;
     }
 
     ifname = HDstrdup(argv[opt_ind]);
@@ -130,33 +135,38 @@ main (int argc, const char *argv[])
 
     if(testval <= 0) {
         error_msg("Input HDF5 file is not HDF \"%s\"\n", ifname);
-        return EXIT_FAILURE;
+        h5tools_setstatus(EXIT_FAILURE);
+        goto done;
     }
 
     ifile = H5Fopen(ifname, H5F_ACC_RDONLY, H5P_DEFAULT);
 
     if(ifile < 0) {
         error_msg("Can't open input HDF5 file \"%s\"\n", ifname);
-        return EXIT_FAILURE;
+        h5tools_setstatus(EXIT_FAILURE);
+        goto done;
     }
 
     plist = H5Fget_create_plist(ifile);
     if(plist < 0) {
         error_msg("Can't get file creation plist for file \"%s\"\n", ifname);
-        return EXIT_FAILURE;
+        h5tools_setstatus(EXIT_FAILURE);
+        goto done;
     }
 
     status = H5Pget_userblock(plist, &usize);
     if(status < 0) {
         error_msg("Can't get user block for file \"%s\"\n", ifname);
-        return EXIT_FAILURE;
+        h5tools_setstatus(EXIT_FAILURE);
+        goto done;
     }
 
     HDprintf("%ld\n", (long) usize);
 
+done:
     H5Pclose (plist);
     H5Fclose (ifile);
 
-    return EXIT_SUCCESS;
+    leave(h5tools_getstatus());
 } /* end main() */
 
diff --git a/tools/test/h5repack/CMakeLists.txt b/tools/test/h5repack/CMakeLists.txt
index 6f0b284..54cff64 100644
--- a/tools/test/h5repack/CMakeLists.txt
+++ b/tools/test/h5repack/CMakeLists.txt
@@ -28,7 +28,7 @@ set (REPACK_COMMON_SOURCES
 )
 add_executable (h5repacktest ${REPACK_COMMON_SOURCES} ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/h5repacktst.c)
 target_include_directories (h5repacktest
-    PRIVATE "${HDF5_TOOLS_SRC_H5REPACK_SOURCE_DIR};${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
+    PRIVATE "${HDF5_TOOLS_SRC_H5REPACK_SOURCE_DIR};${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_TEST_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
 )
 if (NOT ONLY_SHARED_LIBS)
   TARGET_C_PROPERTIES (h5repacktest STATIC)
diff --git a/tools/test/h5repack/CMakeTests.cmake b/tools/test/h5repack/CMakeTests.cmake
index 6a078e3..5e7bbcf 100644
--- a/tools/test/h5repack/CMakeTests.cmake
+++ b/tools/test/h5repack/CMakeTests.cmake
@@ -656,7 +656,7 @@
           COMMAND "${CMAKE_COMMAND}"
               -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5diff${tgt_file_ext}>"
-              -D "TEST_ARGS:STRING=${testfile};out-${testname}_N.${testname}.h5"
+              -D "TEST_ARGS:STRING=-v;${testfile};out-${testname}_N.${testname}.h5"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
               -D "TEST_OUTPUT=out-${testname}_N.${testname}.out"
               -D "TEST_EXPECT=0"
@@ -678,7 +678,7 @@
           COMMAND "${CMAKE_COMMAND}"
               -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5diff${tgt_file_ext}>"
-              -D "TEST_ARGS:STRING=${testfile};out-${testname}_M.${testname}.h5"
+              -D "TEST_ARGS:STRING=-v;${testfile};out-${testname}_M.${testname}.h5"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
               -D "TEST_OUTPUT=out-${testname}_M.${testname}.out"
               -D "TEST_EXPECT=0"
diff --git a/tools/test/h5repack/h5repack.sh.in b/tools/test/h5repack/h5repack.sh.in
index b6cc167..437a2d9 100644
--- a/tools/test/h5repack/h5repack.sh.in
+++ b/tools/test/h5repack/h5repack.sh.in
@@ -741,7 +741,7 @@ TOOLTEST1()
     TESTING $H5REPACK $@
     (
         cd $TESTDIR
-        $RUNSERIAL $H5REPACK_BIN "$@" $infile $outfile
+        $ENVCMD $RUNSERIAL $H5REPACK_BIN "$@" $infile $outfile
     )
     RET=$?
     if [ $RET != 0 ] ; then
diff --git a/tools/test/h5repack/h5repacktst.c b/tools/test/h5repack/h5repacktst.c
index 83c0dad..911572e 100644
--- a/tools/test/h5repack/h5repacktst.c
+++ b/tools/test/h5repack/h5repacktst.c
@@ -382,7 +382,7 @@ int main (void)
         GOERROR;
     if (h5repack_verify(FNAME0, FNAME0OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_cmp_pl(FNAME0, FNAME0OUT) <= 0)
+    if (h5repack_cmp_pl(FNAME0, pack_options.fin_fapl, FNAME0OUT, pack_options.fout_fapl) <= 0)
         GOERROR;
     if (h5repack_end(&pack_options) < 0)
         GOERROR;
@@ -402,7 +402,7 @@ int main (void)
         GOERROR;
     if (h5repack_verify(FNAME1, FNAME1OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_cmp_pl(FNAME1, FNAME1OUT) <= 0)
+    if (h5repack_cmp_pl(FNAME1, pack_options.fin_fapl, FNAME1OUT, pack_options.fout_fapl) <= 0)
         GOERROR;
     if (h5repack_end(&pack_options) < 0)
         GOERROR;
@@ -422,7 +422,7 @@ int main (void)
         GOERROR;
     if (h5repack_verify(FNAME2, FNAME2OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_cmp_pl(FNAME2, FNAME2OUT) <= 0)
+    if (h5repack_cmp_pl(FNAME2, pack_options.fin_fapl, FNAME2OUT, pack_options.fout_fapl) <= 0)
         GOERROR;
     if (h5repack_end(&pack_options) < 0)
         GOERROR;
@@ -441,7 +441,7 @@ int main (void)
         GOERROR;
     if (h5repack_verify(FNAME3, FNAME3OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_cmp_pl(FNAME3, FNAME3OUT) <= 0)
+    if (h5repack_cmp_pl(FNAME3, pack_options.fin_fapl, FNAME3OUT, pack_options.fout_fapl) <= 0)
         GOERROR;
     if (h5repack_end(&pack_options) < 0)
         GOERROR;
@@ -1132,7 +1132,7 @@ int main (void)
             GOERROR;
         if (h5repack_verify(FNAME7, FNAME7OUT, &pack_options) <= 0)
             GOERROR;
-        if (h5repack_cmp_pl(FNAME7, FNAME7OUT) <= 0)
+        if (h5repack_cmp_pl(FNAME7, pack_options.fin_fapl, FNAME7OUT, pack_options.fout_fapl) <= 0)
             GOERROR;
         if (h5repack_end(&pack_options) < 0)
             GOERROR;
@@ -2479,24 +2479,24 @@ int make_szip(hid_t loc_id)
     unsigned szip_pixels_per_block = 8;
     hsize_t  dims[RANK] = {DIM1, DIM2};
     hsize_t  chunk_dims[RANK] = {CDIM1, CDIM2};
-    int      buf[DIM1][DIM2];
-    int      i, j, n;
+    int      **buf = NULL;
     int      szip_can_encode = 0;
 
-    for (i = n = 0; i < DIM1; i++) {
-        for (j = 0; j < DIM2; j++) {
-            buf[i][j] = n++;
-        }
-    }
+    /* Create and fill array */
+    H5TEST_ALLOCATE_2D_ARRAY(buf, int, DIM1, DIM2);
+    if (NULL == buf)
+        goto error;
+    H5TEST_FILL_2D_ARRAY(buf, int, DIM1, DIM2);
+
     /* create a space */
     if((sid = H5Screate_simple(RANK, dims, NULL)) < 0)
-        return -1;
+        goto error;
     /* create a dcpl */
     if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
-        goto out;
+        goto error;
     /* set up chunk */
     if(H5Pset_chunk(dcpl, RANK, chunk_dims) < 0)
-        goto out;
+        goto error;
 
     /*-------------------------------------------------------------------------
     * SZIP
@@ -2509,25 +2509,30 @@ int make_szip(hid_t loc_id)
     if (szip_can_encode) {
         /* set szip data */
         if(H5Pset_szip (dcpl, szip_options_mask, szip_pixels_per_block) < 0)
-            goto out;
-        if (make_dset(loc_id, "dset_szip", sid, dcpl, buf) < 0)
-            goto out;
+            goto error;
+        if (make_dset(loc_id, "dset_szip", sid, dcpl, buf[0]) < 0)
+            goto error;
     }
     else
         /* WARNING? SZIP is decoder only, can't generate test files */
 
     if(H5Sclose(sid) < 0)
-        goto out;
+        goto error;
     if(H5Pclose(dcpl) < 0)
-        goto out;
+        goto error;
+
+    HDfree(buf);
 
     return 0;
 
-out:
+error:
     H5E_BEGIN_TRY {
         H5Pclose(dcpl);
         H5Sclose(sid);
     } H5E_END_TRY;
+
+    HDfree(buf);
+
     return -1;
 }
 #endif /* H5_HAVE_FILTER_SZIP */
@@ -2548,26 +2553,25 @@ int make_deflate(hid_t loc_id)
     hid_t      sid = H5I_INVALID_HID;  /* dataspace ID */
     hsize_t    dims[RANK] = {DIM1,DIM2};
     hsize_t    chunk_dims[RANK] = {CDIM1,CDIM2};
-    int        buf[DIM1][DIM2];
+    int        **buf = NULL;
     hobj_ref_t bufref[1]; /* reference */
     hsize_t    dims1r[1] = {1};
-    int        i, j, n;
 
-    for (i = n = 0; i < DIM1; i++) {
-        for (j = 0; j < DIM2; j++) {
-            buf[i][j] = n++;
-        }
-    }
+    /* Create and fill array */
+    H5TEST_ALLOCATE_2D_ARRAY(buf, int, DIM1, DIM2);
+    if (NULL == buf)
+        goto error;
+    H5TEST_FILL_2D_ARRAY(buf, int, DIM1, DIM2);
 
     /* create a space */
     if((sid = H5Screate_simple(RANK, dims, NULL)) < 0)
-        return -1;
+        goto error;
     /* create a dcpl */
     if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
-        goto out;
+        goto error;
     /* set up chunk */
     if(H5Pset_chunk(dcpl, RANK, chunk_dims) < 0)
-        goto out;
+        goto error;
 
     /*-------------------------------------------------------------------------
     * GZIP
@@ -2576,16 +2580,16 @@ int make_deflate(hid_t loc_id)
 #if defined (H5_HAVE_FILTER_DEFLATE)
     /* set deflate data */
     if(H5Pset_deflate(dcpl, 9) < 0)
-        goto out;
-    if (make_dset(loc_id, "dset_deflate", sid, dcpl, buf) < 0)
-        goto out;
+        goto error;
+    if (make_dset(loc_id, "dset_deflate", sid, dcpl, buf[0]) < 0)
+        goto error;
 
     /* create a reference to the dataset, test second seeep of file for references */
 
     if (H5Rcreate(&bufref[0], loc_id, "dset_deflate", H5R_OBJECT, (hid_t)-1) < 0)
-        goto out;
+        goto error;
     if (write_dset(loc_id, 1, dims1r, "ref", H5T_STD_REF_OBJ, bufref) < 0)
-        goto out;
+        goto error;
 #endif
 
 
@@ -2594,17 +2598,22 @@ int make_deflate(hid_t loc_id)
     *-------------------------------------------------------------------------
     */
     if(H5Sclose(sid) < 0)
-        goto out;
+        goto error;
     if(H5Pclose(dcpl) < 0)
-        goto out;
+        goto error;
+
+    HDfree(buf);
 
     return 0;
 
-out:
+error:
     H5E_BEGIN_TRY {
         H5Pclose(dcpl);
         H5Sclose(sid);
     } H5E_END_TRY;
+
+    HDfree(buf);
+
     return -1;
 }
 
@@ -2619,29 +2628,27 @@ out:
 static
 int make_shuffle(hid_t loc_id)
 {
-    hid_t    dcpl; /* dataset creation property list */
-    hid_t    sid;  /* dataspace ID */
+    hid_t    dcpl = H5I_INVALID_HID; /* dataset creation property list */
+    hid_t    sid = H5I_INVALID_HID;  /* dataspace ID */
     hsize_t  dims[RANK]={DIM1,DIM2};
     hsize_t  chunk_dims[RANK]={CDIM1,CDIM2};
-    int      buf[DIM1][DIM2];
-    int      i, j, n;
+    int      **buf = NULL;
+
+    /* Create and fill array */
+    H5TEST_ALLOCATE_2D_ARRAY(buf, int, DIM1, DIM2);
+    if (NULL == buf)
+        goto error;
+    H5TEST_FILL_2D_ARRAY(buf, int, DIM1, DIM2);
 
-    for (i=n=0; i<DIM1; i++)
-    {
-        for (j=0; j<DIM2; j++)
-        {
-            buf[i][j]=n++;
-        }
-    }
     /* create a space */
     if((sid = H5Screate_simple(RANK, dims, NULL)) < 0)
-        return -1;
+        goto error;
     /* create a dcpl */
     if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
-        goto out;
+        goto error;
     /* set up chunk */
     if(H5Pset_chunk(dcpl, RANK, chunk_dims) < 0)
-        goto out;
+        goto error;
 
     /*-------------------------------------------------------------------------
     * shuffle
@@ -2650,9 +2657,9 @@ int make_shuffle(hid_t loc_id)
 
     /* set the shuffle filter */
     if (H5Pset_shuffle(dcpl) < 0)
-        goto out;
-    if (make_dset(loc_id,"dset_shuffle",sid,dcpl,buf) < 0)
-        goto out;
+        goto error;
+    if (make_dset(loc_id, "dset_shuffle", sid, dcpl, buf[0]) < 0)
+        goto error;
 
 
     /*-------------------------------------------------------------------------
@@ -2660,17 +2667,22 @@ int make_shuffle(hid_t loc_id)
     *-------------------------------------------------------------------------
     */
     if(H5Sclose(sid) < 0)
-        goto out;
+        goto error;
     if(H5Pclose(dcpl) < 0)
-        goto out;
+        goto error;
+
+    HDfree(buf);
 
     return 0;
 
-out:
+error:
     H5E_BEGIN_TRY {
         H5Pclose(dcpl);
         H5Sclose(sid);
     } H5E_END_TRY;
+
+    HDfree(buf);
+
     return -1;
 }
 
@@ -2688,23 +2700,23 @@ int make_fletcher32(hid_t loc_id)
     hid_t    sid = H5I_INVALID_HID;  /* dataspace ID */
     hsize_t  dims[RANK]={DIM1,DIM2};
     hsize_t  chunk_dims[RANK]={CDIM1,CDIM2};
-    int      buf[DIM1][DIM2];
-    int      i, j, n;
+    int      **buf = NULL;
+
+    /* Create and fill array */
+    H5TEST_ALLOCATE_2D_ARRAY(buf, int, DIM1, DIM2);
+    if (NULL == buf)
+        goto error;
+    H5TEST_FILL_2D_ARRAY(buf, int, DIM1, DIM2);
 
-    for (i = n = 0; i < DIM1; i++) {
-        for (j = 0; j < DIM2; j++) {
-            buf[i][j] = n++;
-        }
-    }
     /* create a space */
     if((sid = H5Screate_simple(RANK, dims, NULL)) < 0)
-        return -1;
+        goto error;
     /* create a dataset creation property list; the same DCPL is used for all dsets */
     if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
-        goto out;
+        goto error;
     /* set up chunk */
     if(H5Pset_chunk(dcpl, RANK, chunk_dims) < 0)
-        goto out;
+        goto error;
 
 
     /*-------------------------------------------------------------------------
@@ -2714,29 +2726,34 @@ int make_fletcher32(hid_t loc_id)
 
     /* remove the filters from the dcpl */
     if (H5Premove_filter(dcpl,H5Z_FILTER_ALL) < 0)
-        goto out;
+        goto error;
     /* set the checksum filter */
     if (H5Pset_fletcher32(dcpl) < 0)
-        goto out;
-    if (make_dset(loc_id,"dset_fletcher32",sid,dcpl,buf) < 0)
-        goto out;
+        goto error;
+    if (make_dset(loc_id, "dset_fletcher32", sid, dcpl, buf[0]) < 0)
+        goto error;
 
     /*-------------------------------------------------------------------------
     * close space and dcpl
     *-------------------------------------------------------------------------
     */
     if(H5Sclose(sid) < 0)
-        goto out;
+        goto error;
     if(H5Pclose(dcpl) < 0)
-        goto out;
+        goto error;
+
+    HDfree(buf);
 
     return 0;
 
-out:
+error:
     H5E_BEGIN_TRY {
         H5Pclose(dcpl);
         H5Sclose(sid);
     } H5E_END_TRY;
+
+    HDfree(buf);
+
     return -1;
 }
 
@@ -2757,45 +2774,45 @@ int make_nbit(hid_t loc_id)
     hid_t    dsid = H5I_INVALID_HID;
     hsize_t  dims[RANK]={DIM1,DIM2};
     hsize_t  chunk_dims[RANK]={CDIM1,CDIM2};
-    int      buf[DIM1][DIM2];
-    int      i, j, n;
+    int      **buf = NULL;
+
+    /* Create and fill array */
+    H5TEST_ALLOCATE_2D_ARRAY(buf, int, DIM1, DIM2);
+    if (NULL == buf)
+        goto error;
+    H5TEST_FILL_2D_ARRAY(buf, int, DIM1, DIM2);
 
-    for (i = n = 0; i < DIM1; i++) {
-        for (j = 0; j < DIM2; j++) {
-            buf[i][j] = n++;
-        }
-    }
     /* create a space */
     if((sid = H5Screate_simple(RANK, dims, NULL)) < 0)
-        return -1;
+        goto error;
     /* create a dataset creation property list; the same DCPL is used for all dsets */
     if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
-        goto out;
+        goto error;
     /* set up chunk */
     if(H5Pset_chunk(dcpl, RANK, chunk_dims) < 0)
-        goto out;
+        goto error;
 
     dtid = H5Tcopy(H5T_NATIVE_INT);
     if (H5Tset_precision(dtid,(H5Tget_precision(dtid) - 1)) < 0)
-        goto out;
+        goto error;
 
     /* remove the filters from the dcpl */
     if(H5Premove_filter(dcpl, H5Z_FILTER_ALL) < 0)
-        goto out;
+        goto error;
     if(H5Pset_nbit(dcpl) < 0)
-        goto out;
+        goto error;
     if((dsid = H5Dcreate2(loc_id, "dset_nbit", dtid, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
-        goto out;
-    if(H5Dwrite(dsid, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
-        goto out;
+        goto error;
+    if(H5Dwrite(dsid, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
+        goto error;
     H5Dclose(dsid);
 
     if(H5Premove_filter(dcpl, H5Z_FILTER_ALL) < 0)
-        goto out;
+        goto error;
     if((dsid = H5Dcreate2(loc_id, "dset_int31", dtid, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
-        goto out;
-    if(H5Dwrite(dsid, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
-        goto out;
+        goto error;
+    if(H5Dwrite(dsid, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
+        goto error;
     H5Dclose(dsid);
 
     /*-------------------------------------------------------------------------
@@ -2803,21 +2820,26 @@ int make_nbit(hid_t loc_id)
     *-------------------------------------------------------------------------
     */
     if(H5Sclose(sid) < 0)
-        goto out;
+        goto error;
     if(H5Pclose(dcpl) < 0)
-        goto out;
+        goto error;
     if (H5Tclose(dtid) < 0)
-        goto out;
+        goto error;
+
+    HDfree(buf);
 
     return 0;
 
-out:
+error:
     H5E_BEGIN_TRY {
         H5Tclose(dtid);
         H5Pclose(dcpl);
         H5Sclose(sid);
         H5Dclose(dsid);
     } H5E_END_TRY;
+
+    HDfree(buf);
+
     return -1;
 }
 
@@ -2838,40 +2860,40 @@ int make_scaleoffset(hid_t loc_id)
     hid_t    dsid = H5I_INVALID_HID;
     hsize_t  dims[RANK] = {DIM1,DIM2};
     hsize_t  chunk_dims[RANK] = {CDIM1,CDIM2};
-    int      buf[DIM1][DIM2];
-    int      i, j, n;
+    int      **buf = NULL;
+
+    /* Create and fill array */
+    H5TEST_ALLOCATE_2D_ARRAY(buf, int, DIM1, DIM2);
+    if (NULL == buf)
+        goto error;
+    H5TEST_FILL_2D_ARRAY(buf, int, DIM1, DIM2);
 
-    for (i = n = 0; i < DIM1; i++) {
-        for (j = 0; j < DIM2; j++) {
-            buf[i][j] = n++;
-        }
-    }
     /* create a space */
     if((sid = H5Screate_simple(RANK, dims, NULL)) < 0)
-        return -1;
+        goto error;
     /* create a dataset creation property list; the same DCPL is used for all dsets */
     if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
-        goto out;
+        goto error;
     /* set up chunk */
     if(H5Pset_chunk(dcpl, RANK, chunk_dims) < 0)
-        goto out;
+        goto error;
 
     dtid = H5Tcopy(H5T_NATIVE_INT);
 
     /* remove the filters from the dcpl */
     if(H5Premove_filter(dcpl, H5Z_FILTER_ALL) < 0)
-        goto out;
+        goto error;
     if(H5Pset_scaleoffset(dcpl, H5Z_SO_INT, 31) < 0)
-        goto out;
+        goto error;
     if((dsid = H5Dcreate2(loc_id, "dset_scaleoffset", dtid, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
-        goto out;
-    if(H5Dwrite(dsid, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
-        goto out;
+        goto error;
+    if(H5Dwrite(dsid, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
+        goto error;
     H5Dclose(dsid);
     if((dsid = H5Dcreate2(loc_id, "dset_none", dtid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-        goto out;
-    if(H5Dwrite(dsid, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
-        goto out;
+        goto error;
+    if(H5Dwrite(dsid, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
+        goto error;
     H5Tclose(dtid);
     H5Dclose(dsid);
 
@@ -2880,19 +2902,24 @@ int make_scaleoffset(hid_t loc_id)
     *-------------------------------------------------------------------------
     */
     if(H5Sclose(sid) < 0)
-        goto out;
+        goto error;
     if(H5Pclose(dcpl) < 0)
-        goto out;
+        goto error;
+
+    HDfree(buf);
 
     return 0;
 
-out:
+error:
     H5E_BEGIN_TRY {
         H5Dclose(dsid);
         H5Tclose(dtid);
         H5Pclose(dcpl);
         H5Sclose(sid);
     } H5E_END_TRY;
+
+    HDfree(buf);
+
     return -1;
 }
 
@@ -2912,41 +2939,39 @@ int make_all_filters(hid_t loc_id)
     hid_t    dtid = H5I_INVALID_HID;
     hid_t    dsid = H5I_INVALID_HID;
 #if defined (H5_HAVE_FILTER_SZIP)
-    unsigned szip_options_mask=H5_SZIP_ALLOW_K13_OPTION_MASK|H5_SZIP_NN_OPTION_MASK;
-    unsigned szip_pixels_per_block=8;
+    unsigned szip_options_mask = H5_SZIP_ALLOW_K13_OPTION_MASK | H5_SZIP_NN_OPTION_MASK;
+    unsigned szip_pixels_per_block = 8;
 #endif /* H5_HAVE_FILTER_SZIP */
     hsize_t  dims[RANK]={DIM1,DIM2};
     hsize_t  chunk_dims[RANK]={CDIM1,CDIM2};
-    int      buf[DIM1][DIM2];
-    int      i, j, n;
+    int      **buf = NULL;
 #if defined (H5_HAVE_FILTER_SZIP)
     int szip_can_encode = 0;
 #endif
 
-    for (i=n=0; i<DIM1; i++)
-    {
-        for (j=0; j<DIM2; j++)
-        {
-            buf[i][j]=n++;
-        }
-    }
+    /* Create and fill array */
+    H5TEST_ALLOCATE_2D_ARRAY(buf, int, DIM1, DIM2);
+    if (NULL == buf)
+        goto error;
+    H5TEST_FILL_2D_ARRAY(buf, int, DIM1, DIM2);
+
     /* create a space */
     if((sid = H5Screate_simple(RANK, dims, NULL)) < 0)
-        return -1;
+        goto error;
     /* create a dataset creation property list; the same DCPL is used for all dsets */
     if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
-        goto out;
+        goto error;
     /* set up chunk */
     if (H5Pset_chunk(dcpl, RANK, chunk_dims) < 0)
-        goto out;
+        goto error;
 
     /* set the shuffle filter */
     if (H5Pset_shuffle(dcpl) < 0)
-        goto out;
+        goto error;
 
     /* set the checksum filter */
     if (H5Pset_fletcher32(dcpl) < 0)
-        goto out;
+        goto error;
 
 #if defined (H5_HAVE_FILTER_SZIP)
     if (h5tools_can_encode(H5Z_FILTER_SZIP) == 1)
@@ -2956,8 +2981,8 @@ int make_all_filters(hid_t loc_id)
     if (szip_can_encode)
     {
         /* set szip data */
-        if(H5Pset_szip (dcpl,szip_options_mask,szip_pixels_per_block) < 0)
-            goto out;
+        if(H5Pset_szip (dcpl,szip_options_mask, szip_pixels_per_block) < 0)
+            goto error;
     } else {
         /* WARNING? SZIP is decoder only, can't generate test data using szip */
     }
@@ -2966,20 +2991,20 @@ int make_all_filters(hid_t loc_id)
 #if defined (H5_HAVE_FILTER_DEFLATE)
     /* set deflate data */
     if(H5Pset_deflate(dcpl, 9) < 0)
-        goto out;
+        goto error;
 #endif
 
-    if (make_dset(loc_id,"dset_all",sid,dcpl,buf) < 0)
-        goto out;
+    if (make_dset(loc_id, "dset_all", sid, dcpl, buf[0]) < 0)
+        goto error;
 
     /* remove the filters from the dcpl */
     if (H5Premove_filter(dcpl,H5Z_FILTER_ALL) < 0)
-        goto out;
+        goto error;
     /* set the checksum filter */
     if (H5Pset_fletcher32(dcpl) < 0)
-        goto out;
-    if (make_dset(loc_id,"dset_fletcher32",sid,dcpl,buf) < 0)
-        goto out;
+        goto error;
+    if (make_dset(loc_id, "dset_fletcher32", sid, dcpl, buf[0]) < 0)
+        goto error;
 
 
     /* Make sure encoding is enabled */
@@ -2988,12 +3013,12 @@ int make_all_filters(hid_t loc_id)
     {
         /* remove the filters from the dcpl */
         if (H5Premove_filter(dcpl,H5Z_FILTER_ALL) < 0)
-            goto out;
+            goto error;
         /* set szip data */
         if(H5Pset_szip (dcpl,szip_options_mask,szip_pixels_per_block) < 0)
-            goto out;
-        if (make_dset(loc_id,"dset_szip",sid,dcpl,buf) < 0)
-            goto out;
+            goto error;
+        if (make_dset(loc_id, "dset_szip", sid, dcpl, buf[0]) < 0)
+            goto error;
     } else
     {
         /* WARNING? SZIP is decoder only, can't generate test dataset */
@@ -3003,56 +3028,58 @@ int make_all_filters(hid_t loc_id)
 
     /* remove the filters from the dcpl */
     if (H5Premove_filter(dcpl,H5Z_FILTER_ALL) < 0)
-        goto out;
+        goto error;
     /* set the shuffle filter */
     if (H5Pset_shuffle(dcpl) < 0)
-        goto out;
-    if (make_dset(loc_id,"dset_shuffle",sid,dcpl,buf) < 0)
-        goto out;
+        goto error;
+    if (make_dset(loc_id, "dset_shuffle", sid, dcpl, buf[0]) < 0)
+        goto error;
 
 
 #if defined (H5_HAVE_FILTER_DEFLATE)
     /* remove the filters from the dcpl */
     if (H5Premove_filter(dcpl,H5Z_FILTER_ALL) < 0)
-        goto out;
+        goto error;
     /* set deflate data */
     if(H5Pset_deflate(dcpl, 1) < 0)
-        goto out;
-    if (make_dset(loc_id,"dset_deflate",sid,dcpl,buf) < 0)
-        goto out;
+        goto error;
+    if (make_dset(loc_id, "dset_deflate", sid, dcpl, buf[0]) < 0)
+        goto error;
 #endif
 
 
 
     /* remove the filters from the dcpl */
     if (H5Premove_filter(dcpl, H5Z_FILTER_ALL) < 0)
-        goto out;
+        goto error;
     /* set the shuffle filter */
     if (H5Pset_nbit(dcpl) < 0)
-        goto out;
+        goto error;
     if ((dtid = H5Tcopy(H5T_NATIVE_INT)) < 0)
-        goto out;
+        goto error;
     if (H5Tset_precision(dtid, (H5Tget_precision(dtid) - 1)) < 0)
-        goto out;
+        goto error;
     if((dsid = H5Dcreate2(loc_id, "dset_nbit", dtid, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
-        goto out;
-    if(H5Dwrite(dsid, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
-        goto out;
+        goto error;
+    if(H5Dwrite(dsid, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
+        goto error;
 
     /* close */
     if(H5Tclose(dtid) < 0)
-        goto out;
+        goto error;
     if(H5Dclose(dsid) < 0)
-        goto out;
+        goto error;
 
     if(H5Sclose(sid) < 0)
-        goto out;
+        goto error;
     if(H5Pclose(dcpl) < 0)
-        goto out;
+        goto error;
+
+    HDfree(buf);
 
     return 0;
 
-out:
+error:
     H5E_BEGIN_TRY
     {
         H5Tclose(dtid);
@@ -3060,6 +3087,9 @@ out:
         H5Pclose(dcpl);
         H5Sclose(sid);
     } H5E_END_TRY;
+
+    HDfree(buf);
+
     return -1;
 }
 
@@ -3176,28 +3206,25 @@ int make_layout(hid_t loc_id)
     hid_t    sid=H5I_INVALID_HID;  /* dataspace ID */
     hsize_t  dims[RANK]={DIM1,DIM2};
     hsize_t  chunk_dims[RANK]={CDIM1,CDIM2};
-    int      buf[DIM1][DIM2];
-    int      i, j, n;
+    int      **buf = NULL;
+    int      i;
     char     name[16];
 
+    /* Create and fill array */
+    H5TEST_ALLOCATE_2D_ARRAY(buf, int, DIM1, DIM2);
+    if (NULL == buf)
+        goto error;
+    H5TEST_FILL_2D_ARRAY(buf, int, DIM1, DIM2);
 
-    for (i=n=0; i<DIM1; i++)
-    {
-        for (j=0; j<DIM2; j++)
-        {
-            buf[i][j]=n++;
-        }
-    }
 
     /*-------------------------------------------------------------------------
     * make several dataset with no filters
     *-------------------------------------------------------------------------
     */
-    for (i=0; i<4; i++)
-    {
+    for (i=0; i<4; i++) {
         HDsprintf(name,"dset%d",i+1);
-        if (write_dset(loc_id,RANK,dims,name,H5T_NATIVE_INT,buf) < 0)
-            return -1;
+        if (write_dset(loc_id, RANK, dims, name, H5T_NATIVE_INT, buf[0]) < 0)
+            goto error;
     }
 
 
@@ -3207,63 +3234,60 @@ int make_layout(hid_t loc_id)
     */
     /* create a space */
     if((sid = H5Screate_simple(RANK, dims, NULL)) < 0)
-        return -1;
+        goto error;
     /* create a dataset creation property list; the same DCPL is used for all dsets */
     if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
-    {
-        goto out;
-    }
+        goto error;
 
     /*-------------------------------------------------------------------------
     * H5D_COMPACT
     *-------------------------------------------------------------------------
     */
     if(H5Pset_layout (dcpl,H5D_COMPACT) < 0)
-        goto out;
-    if (make_dset(loc_id,"dset_compact",sid,dcpl,buf) < 0)
-    {
-        goto out;
-    }
+        goto error;
+    if (make_dset(loc_id, "dset_compact", sid, dcpl, buf[0]) < 0)
+        goto error;
 
     /*-------------------------------------------------------------------------
     * H5D_CONTIGUOUS
     *-------------------------------------------------------------------------
     */
     if(H5Pset_layout (dcpl,H5D_CONTIGUOUS) < 0)
-        goto out;
-    if (make_dset(loc_id,"dset_contiguous",sid,dcpl,buf) < 0)
-    {
-        goto out;
-    }
+        goto error;
+    if (make_dset(loc_id, "dset_contiguous", sid, dcpl, buf[0]) < 0)
+        goto error;
 
     /*-------------------------------------------------------------------------
     * H5D_CHUNKED
     *-------------------------------------------------------------------------
     */
     if(H5Pset_chunk(dcpl, RANK, chunk_dims) < 0)
-        goto out;
-    if (make_dset(loc_id,"dset_chunk",sid,dcpl,buf) < 0)
-    {
-        goto out;
-    }
+        goto error;
+    if (make_dset(loc_id, "dset_chunk", sid, dcpl, buf[0]) < 0)
+        goto error;
 
     /*-------------------------------------------------------------------------
     * close space and dcpl
     *-------------------------------------------------------------------------
     */
     if(H5Sclose(sid) < 0)
-        goto out;
+        goto error;
     if(H5Pclose(dcpl) < 0)
-        goto out;
+        goto error;
+
+    HDfree(buf);
 
     return 0;
 
-out:
+error:
     H5E_BEGIN_TRY
     {
         H5Pclose(dcpl);
         H5Sclose(sid);
     } H5E_END_TRY;
+
+    HDfree(buf);
+
     return -1;
 }
 
@@ -3289,44 +3313,45 @@ int make_layout2(hid_t loc_id)
     hid_t    contig_dcpl = H5I_INVALID_HID;   /* dataset creation property list */
     hid_t    chunked_dcpl = H5I_INVALID_HID; /* dataset creation property list */
 
-    int      i, j, n;    /* Local index variables */
     int       ret_value = -1;  /* Return value */
     hid_t    s_sid = H5I_INVALID_HID;  /* dataspace ID */
 
     hsize_t  s_dims[RANK] = {S_DIM1,S_DIM2};  /* Dataspace (< 1 k) */
     hsize_t  chunk_dims[RANK] = {S_DIM1/2, S_DIM2/2};  /* Dimension sizes for chunks */
 
-    int      s_buf[S_DIM1][S_DIM2];  /* Temporary buffer */
+    int      **s_buf = NULL;    /* Temporary buffer */
 
-    for(i = n = 0; i < S_DIM1; i++) {
-        for (j = 0; j < S_DIM2; j++) {
-            s_buf[i][j] = n++;
-        }
-    }
+    /* Create and fill array */
+    H5TEST_ALLOCATE_2D_ARRAY(s_buf, int, S_DIM1, S_DIM2);
+    if (NULL == s_buf)
+        goto error;
+    H5TEST_FILL_2D_ARRAY(s_buf, int, S_DIM1, S_DIM2);
 
     /* Create dataspaces */
     if((s_sid = H5Screate_simple(RANK, s_dims, NULL)) < 0)
-        goto out;
+        goto error;
 
     /* Create contiguous datasets */
     if((contig_dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
-        goto out;
+        goto error;
     if(H5Pset_layout(contig_dcpl, H5D_CONTIGUOUS) < 0)
-        goto out;
-    if(make_dset(loc_id, CONTIG_S, s_sid, contig_dcpl, s_buf) < 0)
-        goto out;
+        goto error;
+    if(make_dset(loc_id, CONTIG_S, s_sid, contig_dcpl, s_buf[0]) < 0)
+        goto error;
 
     /* Create chunked datasets */
     if((chunked_dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
-        goto out;
+        goto error;
     if(H5Pset_chunk(chunked_dcpl, RANK, chunk_dims) < 0)
-        goto out;
-    if(make_dset(loc_id, CHUNKED_S_FIX, s_sid, chunked_dcpl, s_buf) < 0)
-        goto out;
+        goto error;
+    if(make_dset(loc_id, CHUNKED_S_FIX, s_sid, chunked_dcpl, s_buf[0]) < 0)
+        goto error;
+
+    HDfree(s_buf);
 
     ret_value = 0;
 
-out:
+error:
     H5E_BEGIN_TRY {
         H5Pclose(contig_dcpl);
         H5Pclose(chunked_dcpl);
@@ -3335,6 +3360,8 @@ out:
 
     } H5E_END_TRY;
 
+    HDfree(s_buf);
+
     return(ret_value);
 
 } /* make_layout2() */
@@ -3372,27 +3399,20 @@ int make_layout3(hid_t loc_id)
     hsize_t  chunk_dims1[RANK]={DIM1_L3*2,5};
     hsize_t  chunk_dims2[RANK]={SDIM1_L3 + 2, SDIM2_L3/2};
     hsize_t  chunk_dims3[RANK]={SDIM1_L3 - 2, SDIM2_L3/2};
-    int      buf1[DIM1_L3][DIM2_L3];
-    int      buf2[SDIM1_L3][SDIM2_L3];
-    int      i, j, n;
+    int      **buf1 = NULL;
+    int      **buf2 = NULL;
 
-    /* init buf1 */
-    for (i=n=0; i<DIM1_L3; i++)
-    {
-        for (j=0; j<DIM2_L3; j++)
-        {
-            buf1[i][j]=n++;
-        }
-    }
+    /* Create and fill arrays */
+    H5TEST_ALLOCATE_2D_ARRAY(buf1, int, DIM1_L3, DIM2_L3);
+    if (NULL == buf1)
+        goto error;
+    H5TEST_FILL_2D_ARRAY(buf1, int, DIM1_L3, DIM2_L3);
+
+    H5TEST_ALLOCATE_2D_ARRAY(buf2, int, SDIM1_L3, SDIM2_L3);
+    if (NULL == buf2)
+        goto error;
+    H5TEST_FILL_2D_ARRAY(buf2, int, SDIM1_L3, SDIM2_L3);
 
-    /* init buf2 */
-    for (i=n=0; i<SDIM1_L3; i++)
-    {
-        for (j=0; j<SDIM2_L3; j++)
-        {
-            buf2[i][j]=n++;
-        }
-    }
 
     /*-------------------------------------------------------------------------
     * make chunked dataset with
@@ -3403,19 +3423,15 @@ int make_layout3(hid_t loc_id)
     */
     /* create a space */
     if((sid1 = H5Screate_simple(RANK, dims1, maxdims)) < 0)
-        return -1;
+        goto error;
     /* create a dataset creation property list; the same DCPL is used for all dsets */
     if ((dcpl1 = H5Pcreate(H5P_DATASET_CREATE)) < 0)
-    {
-        goto out;
-    }
+        goto error;
 
     if(H5Pset_chunk(dcpl1, RANK, chunk_dims1) < 0)
-        goto out;
-    if (make_dset(loc_id,"chunk_unlimit1",sid1,dcpl1,buf1) < 0)
-    {
-        goto out;
-    }
+        goto error;
+    if (make_dset(loc_id, "chunk_unlimit1", sid1, dcpl1, buf1[0]) < 0)
+        goto error;
 
     /*-------------------------------------------------------------------------
     * make chunked dataset with
@@ -3427,16 +3443,16 @@ int make_layout3(hid_t loc_id)
 
     /* create a space */
     if((sid2 = H5Screate_simple(RANK, dims2, maxdims)) < 0)
-        return -1;
+        goto error;
     /* create a dataset creation property list; the same DCPL is used for all dsets */
     if ((dcpl2 = H5Pcreate(H5P_DATASET_CREATE)) < 0)
-        goto out;
+        goto error;
 
     if(H5Pset_chunk(dcpl2, RANK, chunk_dims2) < 0)
-        goto out;
+        goto error;
 
-    if (make_dset(loc_id,"chunk_unlimit2",sid2,dcpl2,buf2) < 0)
-        goto out;
+    if (make_dset(loc_id, "chunk_unlimit2", sid2, dcpl2, buf2[0]) < 0)
+        goto error;
 
     /*-------------------------------------------------------------------------
     * make chunked dataset with
@@ -3447,32 +3463,35 @@ int make_layout3(hid_t loc_id)
     */
     /* create a dataset creation property list; the same DCPL is used for all dsets */
     if ((dcpl3 = H5Pcreate(H5P_DATASET_CREATE)) < 0)
-        goto out;
+        goto error;
 
     if(H5Pset_chunk(dcpl3, RANK, chunk_dims3) < 0)
-        goto out;
+        goto error;
 
-    if (make_dset(loc_id,"chunk_unlimit3",sid2,dcpl3,buf2) < 0)
-        goto out;
+    if (make_dset(loc_id, "chunk_unlimit3", sid2, dcpl3, buf2[0]) < 0)
+        goto error;
 
     /*-------------------------------------------------------------------------
     * close space and dcpl
     *-------------------------------------------------------------------------
     */
     if(H5Sclose(sid1) < 0)
-        goto out;
+        goto error;
     if(H5Sclose(sid2) < 0)
-        goto out;
+        goto error;
     if(H5Pclose(dcpl1) < 0)
-        goto out;
+        goto error;
     if(H5Pclose(dcpl2) < 0)
-        goto out;
+        goto error;
     if(H5Pclose(dcpl3) < 0)
-        goto out;
+        goto error;
+
+    HDfree(buf1);
+    HDfree(buf2);
 
     return 0;
 
-out:
+error:
     H5E_BEGIN_TRY
     {
         H5Sclose(sid1);
@@ -3481,6 +3500,10 @@ out:
         H5Pclose(dcpl2);
         H5Pclose(dcpl3);
     } H5E_END_TRY;
+
+    HDfree(buf1);
+    HDfree(buf2);
+
     return -1;
 }
 
@@ -3684,10 +3707,10 @@ make_userblock(void)
 {
     hid_t   fid = H5I_INVALID_HID;
     hid_t   fcpl = H5I_INVALID_HID;
-    int     fd = -1;            /* File descriptor for writing userblock */
-    char    ub[USERBLOCK_SIZE]; /* User block data */
-    ssize_t nwritten;           /* # of bytes written */
-    size_t  u;                  /* Local index variable */
+    int     fd = -1;                       /* File descriptor for writing userblock */
+    char    ub[USERBLOCK_SIZE];            /* User block data */
+    ssize_t H5_ATTR_NDEBUG_UNUSED nwritten; /* # of bytes written */
+    size_t  u;                             /* Local index variable */
 
     /* Create file creation property list with userblock set */
     if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
@@ -3749,7 +3772,7 @@ verify_userblock( const char* filename)
     int     fd = -1;            /* File descriptor for writing userblock */
     char    ub[USERBLOCK_SIZE]; /* User block data */
     hsize_t ub_size = 0;        /* User block size */
-    ssize_t nread;              /* # of bytes read */
+    ssize_t H5_ATTR_NDEBUG_UNUSED nread; /* # of bytes read */
     size_t  u;                  /* Local index variable */
 
     /* Open file with userblock */
@@ -3816,7 +3839,7 @@ make_userblock_file(void)
 {
     int     fd = -1;            /* File descriptor for writing userblock */
     char    ub[USERBLOCK_SIZE]; /* User block data */
-    ssize_t nwritten;           /* # of bytes written */
+    ssize_t H5_ATTR_NDEBUG_UNUSED nwritten; /* # of bytes written */
     size_t  u;                  /* Local index variable */
 
     /* initialize userblock data */
diff --git a/tools/test/misc/CMakeLists.txt b/tools/test/misc/CMakeLists.txt
index 060c15b..8f13d84 100644
--- a/tools/test/misc/CMakeLists.txt
+++ b/tools/test/misc/CMakeLists.txt
@@ -18,7 +18,7 @@ if (HDF5_BUILD_GENERATORS AND NOT ONLY_SHARED_LIBS)
   #add_test (NAME h5repart_gentest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repart_gentest>)
 
   add_executable (h5clear_gentest ${HDF5_TOOLS_TEST_MISC_SOURCE_DIR}/h5clear_gentest.c)
-  target_include_directories (h5clear_gentest PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  target_include_directories (h5clear_gentest PRIVATE "${HDF5_SRC_DIR};${HDF5_TEST_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
   if (NOT ONLY_SHARED_LIBS)
     TARGET_C_PROPERTIES (h5clear_gentest STATIC)
     target_link_libraries (h5clear_gentest PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
diff --git a/tools/test/misc/Makefile.am b/tools/test/misc/Makefile.am
index f2d2489..c58ba38 100644
--- a/tools/test/misc/Makefile.am
+++ b/tools/test/misc/Makefile.am
@@ -21,7 +21,7 @@ include $(top_srcdir)/config/commence.am
 SUBDIRS=vds
 
 # Include src directory
-AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
+AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib
 
 #test scripts and programs
 TEST_PROG=h5repart_gentest h5clear_gentest talign
diff --git a/tools/test/misc/clear_open_chk.c b/tools/test/misc/clear_open_chk.c
index 3a61385..7d22ca6 100644
--- a/tools/test/misc/clear_open_chk.c
+++ b/tools/test/misc/clear_open_chk.c
@@ -53,7 +53,7 @@ main(int argc, char *argv[])
     fname = HDstrdup(argv[1]);
 
     /* Try opening the file */
-    if((fid = h5tools_fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, (size_t)0)) < 0) {
+    if((fid = h5tools_fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT, FALSE, NULL, (size_t)0)) < 0) {
         HDfprintf(stderr, "clear_open_chk: unable to open the file\n");
         HDfree(fname);
         HDexit(EXIT_FAILURE);
diff --git a/tools/test/misc/h5clear_gentest.c b/tools/test/misc/h5clear_gentest.c
index d5f415e..8d6883c 100644
--- a/tools/test/misc/h5clear_gentest.c
+++ b/tools/test/misc/h5clear_gentest.c
@@ -11,7 +11,7 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 #include "hdf5.h"
-#include "H5private.h"
+#include "h5test.h"
 
 /* The HDF5 test files */
 const char *FILENAME[] = {
@@ -62,13 +62,21 @@ gen_cache_image_file(const char *fname)
     hid_t dcpl = H5I_INVALID_HID;                /* Dataset creation property list */
     hsize_t dims[2];                /* Dimension sizes */
     hsize_t chunks[2];              /* Chunked dimension sizes */
-    int buf[50][100];               /* Buffer for data to write */
     int i, j;                       /* Local index variables */
+    int **buf = NULL;               /* Buffer for data to write */
     H5AC_cache_image_config_t cache_image_config =  /* Cache image input configuration */
                             { H5AC__CURR_CACHE_IMAGE_CONFIG_VERSION,
                               TRUE, FALSE,
                               H5AC__CACHE_IMAGE__ENTRY_AGEOUT__NONE};
 
+    /* Create and fill array */
+    H5TEST_ALLOCATE_2D_ARRAY(buf, int, 50, 100);
+    if (NULL == buf)
+        goto error;
+    for(i = 0; i < 50; i++)
+        for(j = 0; j < 100; j++)
+            buf[i][j] = i * j;
+
     /* Create a copy of file access property list */
     if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
         goto error;
@@ -91,11 +99,6 @@ gen_cache_image_file(const char *fname)
     if((sid = H5Screate_simple(2, dims, NULL)) < 0)
         goto error;
 
-    /* Initialize buffer for writing to dataset */
-    for(i = 0; i < 50; i++)
-        for(j = 0; j < 100; j++)
-            buf[i][j] = i * j;
-
     /* Set up to create a chunked dataset */
     if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         goto error;
@@ -107,7 +110,7 @@ gen_cache_image_file(const char *fname)
         goto error;
 
     /* Write to the dataset */
-    if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+    if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
         goto error;
 
     /* Closing */
@@ -121,6 +124,9 @@ gen_cache_image_file(const char *fname)
         goto error;
     if(H5Fclose(fid) < 0)
         goto error;
+
+    HDfree(buf);
+
     return 0;
 
 error:
@@ -132,6 +138,9 @@ error:
         H5Pclose(fapl);
         H5Pclose(dcpl);
     } H5E_END_TRY;
+
+    HDfree(buf);
+
     return 1;
 } /* gen_cache_image_file() */
 
diff --git a/tools/test/misc/h5repart_gentest.c b/tools/test/misc/h5repart_gentest.c
index 5c1ff87..bd94104 100644
--- a/tools/test/misc/h5repart_gentest.c
+++ b/tools/test/misc/h5repart_gentest.c
@@ -25,7 +25,8 @@
 #define FAMILY_SIZE     1024
 #define FILENAME        "family_file%05d.h5"
 
-static int buf[FAMILY_NUMBER][FAMILY_SIZE];
+int     **buf       = NULL;
+int     *buf_data   = NULL;
 
 int main(void)
 {
@@ -34,66 +35,82 @@ int main(void)
     int         i, j;
     hsize_t     dims[2]={FAMILY_NUMBER, FAMILY_SIZE};
 
+    /* Set up data array */
+    if(NULL == (buf_data = (int *)HDcalloc(FAMILY_NUMBER * FAMILY_SIZE, sizeof(int)))) {
+        HDperror("HDcalloc");
+        HDexit(EXIT_FAILURE);
+    }
+    if(NULL == (buf = (int **)HDcalloc(FAMILY_NUMBER, sizeof(buf_data)))) {
+        HDperror("HDcalloc");
+        HDexit(EXIT_FAILURE);
+    }
+    for (i = 0; i < FAMILY_NUMBER; i++)
+        buf[i] = buf_data + (i * FAMILY_SIZE);
+
     /* Set property list and file name for FAMILY driver */
-    if ((fapl=H5Pcreate(H5P_FILE_ACCESS)) < 0) {
-        perror ("H5Pcreate");
-        exit (EXIT_FAILURE);
+    if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) {
+        HDperror("H5Pcreate");
+        HDexit(EXIT_FAILURE);
     }
 
     if(H5Pset_fapl_family(fapl, (hsize_t)FAMILY_SIZE, H5P_DEFAULT) < 0) {
-        perror ("H5Pset_fapl_family");
-        exit (EXIT_FAILURE);
+        HDperror("H5Pset_fapl_family");
+        HDexit(EXIT_FAILURE);
     }
 
     if((file = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) {
-        perror("H5Fcreate");
-        exit(EXIT_FAILURE);
+        HDperror("H5Fcreate");
+        HDexit(EXIT_FAILURE);
     }
 
     /* Create and write dataset */
     if((space = H5Screate_simple(2, dims, NULL)) < 0) {
-        perror("H5Screate_simple");
-        exit(EXIT_FAILURE);
+        HDperror("H5Screate_simple");
+        HDexit(EXIT_FAILURE);
     }
 
 
     if((dset = H5Dcreate2(file, dname, H5T_NATIVE_INT, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
-        perror("H5Dcreate2");
-        exit(EXIT_FAILURE);
+        HDperror("H5Dcreate2");
+        HDexit(EXIT_FAILURE);
     }
 
 
-    for(i = 0; i<FAMILY_NUMBER; i++)
-        for(j = 0; j<FAMILY_SIZE; j++)
+    for(i = 0; i < FAMILY_NUMBER; i++)
+        for(j = 0; j < FAMILY_SIZE; j++)
             buf[i][j] = i * 10000 + j;
 
-    if(H5Dwrite(dset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) {
-        perror("H5Dwrite");
-        exit(EXIT_FAILURE);
+    if(H5Dwrite(dset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_data) < 0) {
+        HDperror("H5Dwrite");
+        HDexit(EXIT_FAILURE);
     }
 
 
     if(H5Sclose(space) < 0) {
-        perror ("H5Sclose");
-        exit (EXIT_FAILURE);
+        HDperror("H5Sclose");
+        HDexit(EXIT_FAILURE);
     }
 
     if(H5Dclose(dset) < 0) {
-        perror ("H5Dclose");
-        exit (EXIT_FAILURE);
+        HDperror("H5Dclose");
+        HDexit(EXIT_FAILURE);
     }
 
     if(H5Pclose(fapl) < 0) {
-        perror ("H5Pclose");
-        exit (EXIT_FAILURE);
+        HDperror("H5Pclose");
+        HDexit(EXIT_FAILURE);
     }
 
     if(H5Fclose(file) < 0) {
-        perror ("H5Fclose");
-        exit (EXIT_FAILURE);
+        HDperror("H5Fclose");
+        HDexit(EXIT_FAILURE);
     }
 
-    puts(" PASSED"); fflush(stdout);
+    HDfree(buf);
+    HDfree(buf_data);
+
+    HDputs(" PASSED");
+    HDfflush(stdout);
 
-    return 0;
+    return EXIT_SUCCESS;
 }
diff --git a/tools/test/misc/testfiles/h5mkgrp_help.txt b/tools/test/misc/testfiles/h5mkgrp_help.txt
index ba130f6..2f67c4b 100644
--- a/tools/test/misc/testfiles/h5mkgrp_help.txt
+++ b/tools/test/misc/testfiles/h5mkgrp_help.txt
@@ -5,3 +5,4 @@ usage: h5mkgrp [OPTIONS] FILE GROUP...
       -p, --parents      No error if existing, make parent groups as needed
       -v, --verbose      Print information about OBJECTS and OPTIONS
       -V, --version      Print version number and exit
+