Feature/improve settings

[skip ci]