fix templating and comment