sync with production and w3c corrections