Added HTML module.
Pulled out HTML-specific stuff.
Tweaks.