For HTML generation
Misc edits
For HTML generation