HTML tag fixes and improved texts