update template and other changes
43 files changed