typo and template enhancement