Updated templates, tested, fixed issues

Updated templates, tested, fixed issues