modify template; other small change