improved haddock documentation; still could use some work