More templates.  Fixed some typoes.