minor updates to various templates