Fix some typo's and try to fix settings apply function