hg fixes and comments