diff --git a/core/src/index.ts b/core/src/index.ts
index 23f491cca..282a42238 100644
--- a/core/src/index.ts
+++ b/core/src/index.ts
@@ -26,4 +26,5 @@ export * from "./neighbourhood/NeighbourhoodProxy";
 export * from "./typeDefs";
 export * from "./DID";
 export * from "./utils";
-export * from './subject/SubjectEntity'
\ No newline at end of file
+export * from './subject/SubjectEntity'
+export * from "./agent/AgentClient";
diff --git a/rust-executor/src/js_core/futures.rs b/rust-executor/src/js_core/futures.rs
index f50a612cd..ece737c17 100644
--- a/rust-executor/src/js_core/futures.rs
+++ b/rust-executor/src/js_core/futures.rs
@@ -5,6 +5,7 @@ use std::future::Future;
 use std::pin::Pin;
 use std::sync::Arc;
 use std::task::{Context, Poll};
+use std::thread::sleep;
 use tokio::sync::Mutex as TokioMutex;
 
 pub struct EventLoopFuture {
@@ -21,6 +22,7 @@ impl Future for EventLoopFuture {
     type Output = Result<(), AnyError>; // You can customize the output type.
 
     fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        sleep(std::time::Duration::from_millis(1));
         let worker = self.worker.try_lock();
         if let Ok(mut worker) = worker {
             let res = worker.poll_event_loop(cx, false);
diff --git a/ui/src/components/Login.tsx b/ui/src/components/Login.tsx
index fce195aeb..fb324d4f9 100644
--- a/ui/src/components/Login.tsx
+++ b/ui/src/components/Login.tsx
@@ -430,15 +430,25 @@ const Login = (props: any) => {
               >
                 Reset agent
               </j-button>
-              <j-box px="100" >          
-              <j-toggle
-                checked={holochain}
-                onChange={(e) => {
-                  setHolochain(e.target.checked);
-                }}
-              >
-                {`Turn ${holochain ? 'off' : "on"} Holochain`}
-              </j-toggle>
+              <j-box px="100" >
+              <j-popover event="mouseover" placement="bottom">          
+                <j-toggle slot="trigger"
+                  checked={holochain}
+                  onChange={(e) => {
+                    setHolochain(e.target.checked);
+                  }}
+                >
+                  {`Enable Holochain`}
+                </j-toggle>
+                <j-box p="200" slot="content">
+                  <j-text size="400" color="black" weight="600">
+                    This ADAM release includes a new unstable Holochain release for testing.
+                  </j-text>
+                  <j-text size="400" color="black" weight="600">
+                    Regular use of ADAM will work without Holochain using our centralized testing Languages.
+                  </j-text>
+                </j-box>
+              </j-popover>
             </j-box>
               <j-button
                 full