updated various templates