html5 mode
html5 mode improvements