Persistance added
-add commit() method calls so that the settings actually get saved