update template files, other fixes