updated templates a bit