Update config files and docs with review comments