Did final polish of rework of hash db code