improved templates and files