small template updates
Small fixes