Improve Haddocks