simplify templates

some small fixes