Succesfully save settings between restarts
minor changes in options
Merge branch 'settings' into dev