fix spelling
merge and update saved settings