Improved/Fixed the haddock documentation