improving some settings and imports