Changes to validate with W3C + minor additions