Renaming HMD and adding some override annotations.  Also adding some missing functions from Hmd