template adjustments
Merge pull request #15 from evildmp/new_templates

template adjustments