mostly changes in hgdata (that is not part of this repo