Fix default config; cleanup State usage; remove one thread from State.