fixes to template as proposed by user on forum