Sprinkle some comments on the code.
More comments.
Update HTML.
Merge branch 'master' into standalone-lib