added Haddock comments