Updated templates, tag logic, and README.md