fixed syntax issue, fixed templates