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