Merged in hierhash and minor edit