fix templates
fix version