update: Haddock comments updated.