Added lots of new templates, changed variable behaviour