fixed some haddock comments
fixed more haddock documentation