Settings, misc fixes and changed