Add more functionality to deviceSettings
Fix bug