Corrections to make markup more valid (quoting attributes, encoding ampersands, etc.)