minor changes to templates