modifications to pass validator.w3.org