Fix TOC. Linkify comments.
Merge remote-tracking branch 'llama-demo/master'