fix
update settings
improvements