added .templates, modified other stuff