Optionally display descriptions

Also fix several minor typo bugs in the process. This is mainly to make
things easier for the editor, so descriptions can be edited on-screen,
even though that's not very WYSIWYGish.