adjusted settings, and fixed naming