more fixes
add lucre info to branch
try to fix merge errors
try another fix too
update
finish distributed security