Some work on the haddock documentation