mega fix, settings bug fix