Update template with fixes for Andy's comments