A cleanup to get it to validate. Fixed some invalid and missplet markup.
Lots of undefined entities still exist, but they will be fixed with a
later commit.