added template files, updated other files