fix some templates and add new templates