added fixes to template