More Haddock comments