Some corrections, and documentation from the wiki.