testing
update docs and config
fix conf path
merge