data collection
settings fix