[++] switch settings, cleanups