Updated haddock comments.
Updated description.