added some templates and removed some defaults