minor changes working on more templating