some template stuff
some small changes