updated docs, settings, and restored the run-time config parameters from the lock_free branch