improve data and templates

improve