- improved settings class in conf
- improved tests