A few lang tweaks
Minor template fix