Corrections for HTML Entity values and further formatting changes