Add some variables, clean up template rendering.