reimplemented simplified salsa clien; propagated changes to orchestrator