haddocks: more linking and punctuation