couple updates to the template

fixes for generators