Some cosmetic changes mostly to hnat

More changes/additions to hnat to follow soon.