Hugo changes

My compiled version of the changes appears to have added a couple <p>
elements elsewhere, not sure why that is. Probably not that big a deal.
Also other various fixes.