bug fixes and settings update