html5 valid, minor adjustments