docs: more time diagrams, minor fixes
Merge branch 'master' into gh-pages

* master:
  docs: more time diagrams, minor fixes