Improvements to haddock docs