fixing templating and servers