More commenting.
Merge branch 'modularisation' into gh-pages

* modularisation:
  More commenting.