Extra templates / minor changes to templates