fixed issues with templates, added more attributes to make things more configurable