Improved user interface, and commentaries

Commentaries are provided as is, without any guarantee