[#523] Minor fixes.
[#523] Reflow and better link to toolkit.