added templates
updated settings
more settings updates