more haddock diagram corrections