A fair amount of haddock documentation, plus some moving around