General improvements, settings, data changes