New, more explicit template names, and a polite thankyou msg on adding