template wording fixes2 from Bernhard