More haddock comments