tweaked defaults
Merge branch 'local'