settings bug fixes