small fixes and settings restructurization (untested)