Several tweaks
Tweaks
Merge branch 'html' into traversing_the_dom
Lots of small changes based on reviewer feedback