Config file better, but not perfect. Fixing issue #22