fixed a lot of templates