fixed some template stuff: