Some more work on HTMLGenerator