Fixing settings bugs, improving notifications