fix templates
add save related