bug fixes and all settings