#master: more w3c polished