small changes to templates