small changes and settings update