Simplified templating
Fixed typo and updated readme with new template variables