templates fixes
small fixes