Add closing tags, correct incorrect tags