fixes to conform html spec