Several tweaks
Tweaks
Merge branch 'html' into creating_elements
Many tweaks