Improve generator output and link.