Templater fixes and docs