template: many small improvements
josm: Upgraded