more improvements to HMD Tools