fixed settings bugs
Merge branch 'danny'