More work on HTMLGenerator