Changed default config, fixed npe