continued editing, some template changes