fix data and settings