Adding settings support, bug fixes, add evidences support