A lot of templates implemented
Bugs fixed