Template Trouble

Fixed some template stuff.