several small fixed in all templates