A number of minor modifications to the HTML.

This pull request contains the merge of your three patch branches from yesterday (2013-07-07).

The final commit 15ceeaa contains a few small modifications to the HTML, mostly improving the markup and fixing errors in the text.