small changes and settings is now persisted