fixed distribution plugin config, cleanups