HTMLGenerator mostly done, just bug-fixing