Updates for PUT vs POST on templates and a few other additions.