Add Haddock comments where not self-explanatory