fix templates a little