Improved templates, fixed bug