Bug fixes,  Template touchups, Template prep for Teams/Agents/Ringers