Update printing code.
Fix standardization of dbh.
Renames for clarity.