a bunch of updates to Templates api section