some template fixes + updates
updates