add more conf options, change a few defaults
Merge branch 'hotfix/0.4.2'
Merge branch 'hotfix/0.4.2' into develop
Merge branch 'develop'