hash additions, fixes