Fixes to HTML parser
Rebuilt