few fixes + html5 urls