more work on settings
fix conflict