diff --git a/C/absmi_insts.h b/C/absmi_insts.h
index 5499274c2..a26eb830b 100644
--- a/C/absmi_insts.h
+++ b/C/absmi_insts.h
@@ -9,8 +9,8 @@
 #endif /* INDENT_CODE */
 
       BOp(Ystop, l);
-      LOCAL_CBorder = 0;
-      SET_ASP(YREG, E_CB * sizeof(CELL));
+      //LOCAL_CBorder = 0;
+      //SET_ASP(YREG, E_CB * sizeof(CELL));
       /* make sure ASP is initialized */
       saveregs();
 
@@ -20,12 +20,12 @@
 #if BP_FREE
       P1REG = PCBACKUP;
 #endif
-      LOCAL_CBorder = 0;
+      //LOCAL_CBorder = 0;
       return 1;
       ENDBOp();
 
       BOp(Nstop, e);
-      SET_ASP(YREG, E_CB * sizeof(CELL));
+      //SET_ASP(YREG, E_CB * sizeof(CELL));
       saveregs();
 #if PUSH_REGS
       restore_absmi_regs(old_regs);
diff --git a/C/c_interface.c b/C/c_interface.c
index 6d8c8549f..6efe45e64 100755
--- a/C/c_interface.c
+++ b/C/c_interface.c
@@ -1769,7 +1769,7 @@ X_API bool YAP_EnterGoal(YAP_PredEntryPtr ape, CELL *ptr, YAP_dogoalinfo *dgi) {
   dgi->CurSlot = LOCAL_CurSlot;
   // ensure our current ENV receives current P.
 
-  Yap_PrepGoal(pe->ArityOfPE, nullptr, B PASS_REGS);
+  Yap_PrepGoal(pe->ArityOfPE, nullptr, dgi PASS_REGS);
   P = pe->CodeOfPred;
   // __android_log_print(ANDROID_LOG_INFO, "YAP ", "ap=%p %ld %x %x args=%x,%x
   // slot=%ld", pe, pe->CodeOfPred->opc, FAILCODE, Deref(ARG1), Deref(ARG2),
@@ -1822,7 +1822,7 @@ X_API bool YAP_RetryGoal(YAP_dogoalinfo *dgi) {
   out = Yap_exec_absmi(true, true   );
   if (out) {
     dgi->EndSlot = LOCAL_CurSlot;
-    dgi->b = myB;
+    dgi->b = LCL0-CellPtr(myB);
   } else {
     LOCAL_CurSlot =
         dgi->CurSlot; // ignore any slots created within the called goal
@@ -1870,7 +1870,7 @@ X_API bool YAP_LeaveGoal(bool successful, YAP_dogoalinfo *dgi) {
   ASP = LCL0-dgi->a;
   B = (choiceptr)(LCL0-dgi->b)
   RECOVER_MACHINE_REGS();
-   fprintf(stderr,"LeftGoal success=%ld: H=%ld ENV=%ld B=%ld TR=%ld P=%p CP=%p,    Slots=%ld\n",    successful,HR-H0,LCL0-ENV,LCL0-(CELL*)B,(CELL*)TR-LCL0, P,
+   fprintf(stderr,"LeftGoal success=%d: H=%ld ENV=%ld B=%ld TR=%ld P=%p CP=%p,    Slots=%ld\n",    successful,HR-H0,LCL0-ENV,LCL0-(CELL*)B,(CELL*)TR-LCL0, P,
     CP, LOCAL_CurSlot);
   return TRUE;
 }
diff --git a/C/exec.c b/C/exec.c
index f332fd307..c0c51f72c 100755
--- a/C/exec.c
+++ b/C/exec.c
@@ -1598,7 +1598,7 @@ static bool exec_absmi(bool top, yap_reset_t reset_mode USES_REGS) {
       ASP = (CELL *)PROTECT_FROZEN_B(B);
 
       if (B == NULL || B->cp_b == NULL ||
-          (CELL *)(B->cp_b) > LCL0 - LOCAL_CBorder) {
+          (CELL *)(B->cp_b) >= LCL0 - LOCAL_CBorder) {
         LOCAL_RestartEnv = sighold;
         LOCAL_CBorder = OldBorder;
         pop_text_stack(i + 1);
@@ -1609,8 +1609,8 @@ static bool exec_absmi(bool top, yap_reset_t reset_mode USES_REGS) {
   }
   YENV = ASP;
   YENV[E_CB] = Unsigned(B);
-  pop_text_stack(i + 1);
   out = Yap_absmi(0);
+
   /* make sure we don't leave a FAIL signal hanging around */
   Yap_get_signal(YAP_FAIL_SIGNAL);
   if (!Yap_has_a_signal())
@@ -1621,7 +1621,7 @@ static bool exec_absmi(bool top, yap_reset_t reset_mode USES_REGS) {
   return out;
 }
 
-void Yap_PrepGoal(arity_t arity, CELL *pt, choiceptr saved_b USES_REGS) {
+void Yap_PrepGoal(arity_t arity, CELL *pt, YAP_dogoalinfo *gip USES_REGS) {
   /* create an initial pseudo environment so that when garbage
      collection is going up in the environment chain it doesn't get
      confused */
@@ -1655,20 +1655,18 @@ void Yap_PrepGoal(arity_t arity, CELL *pt, choiceptr saved_b USES_REGS) {
   B->cp_cp = CP;
   B->cp_ap = NOCODE;
   B->cp_env = ENV;
-  B->cp_b = saved_b;
 #ifdef DEPTH_LIMIT
   B->cp_depth = DEPTH;
 #endif /* DEPTH_LIMIT */
   YENV = ASP = (CELL *)B;
   YENV[E_CB] = (CELL)B;
   HB = HR;
-  CP = YESCODE;
+  gip->b = LCL0-CellPtr(B);
 }
 
-static bool do_goal(yamop *CodeAdr, int arity, CELL *pt, bool top USES_REGS) {
-  choiceptr saved_b = B;
+static bool do_goal(yamop *CodeAdr, int arity, CELL *pt, YAP_dogoalinfo *gi, bool top USES_REGS) {
   bool out;
-  Yap_PrepGoal(arity, pt, saved_b PASS_REGS);
+  Yap_PrepGoal(arity, pt, gi PASS_REGS);
   //  CACHE_A1();
   P = (yamop *)CodeAdr;
   //  S = CellPtr(RepPredProp(
@@ -1740,18 +1738,21 @@ void Yap_fail_all(choiceptr bb USES_REGS) {
 }
 
 bool Yap_execute_pred(PredEntry *ppe, CELL *pt, bool pass_ex USES_REGS) {
-  yamop *saved_p, *saved_cp;
   yamop *CodeAdr;
   bool out;
-
-  saved_p = P;
-  saved_cp = CP;
+  YAP_dogoalinfo gi;
+  gi.p = P;
+   gi.cp = CP;
+   gi.b0 = LCL0-CellPtr(B);
+   gi.CurSlot = Yap_CurrentHandle();
+   gi.a = LCL0-ASP;
+   gi.e = LCL0-ENV;
   LOCAL_PrologMode |= TopGoalMode;
 
   PELOCK(81, ppe);
   CodeAdr = ppe->CodeOfPred;
   UNLOCK(ppe->PELock);
-  out = do_goal(CodeAdr, ppe->ArityOfPE, pt, false PASS_REGS);
+  out = do_goal(CodeAdr, ppe->ArityOfPE, pt, &gi, false PASS_REGS);
 
   if (out) {
     choiceptr cut_B;
@@ -1772,14 +1773,14 @@ bool Yap_execute_pred(PredEntry *ppe, CELL *pt, bool pass_ex USES_REGS) {
 #endif
     }
 #endif /* TABLING */
-    B = cut_B;
-    CP = saved_cp;
-    P = saved_p;
-    ASP = ENV;
+    B = (choiceptr)(LCL0-gi.b0);
+    CP = gi.cp;
+    P = gi.p;
+    ASP = LCL0-gi.a;
 #ifdef DEPTH_LIMIT
     DEPTH = ENV[E_DEPTH];
 #endif
-    ENV = (CELL *)(ENV[E_E]);
+    ENV = LCL0-gi.e;
     /* we have failed, and usually we would backtrack to this B,
        trouble is, we may also have a delayed cut to do */
     if (B != NULL)
@@ -1798,18 +1799,18 @@ bool Yap_execute_pred(PredEntry *ppe, CELL *pt, bool pass_ex USES_REGS) {
     }
    return true;
   } else if (out == 0) {
-    P = saved_p;
-    CP = saved_cp;
+    P = gi.p;
+    CP = gi.cp;
     HR = B->cp_h;
 #ifdef DEPTH_LIMIT
     DEPTH = B->cp_depth;
 #endif
     /* ASP should be set to the top of the local stack when we
        did the call */
-    ASP = B->cp_env;
+    ASP = LCL0-gi.a;
     /* YENV should be set to the current environment */
-    YENV = ENV = (CELL *)((B->cp_env)[E_E]);
-    B = B->cp_b;
+    YENV = ENV = LCL0-gi.e;
+    B =(choiceptr)(LCL0-gi.b);
     SET_BB(B);
     HB = PROTECT_FROZEN_H(B);
     // should we catch the exception or pass it through?
@@ -1893,7 +1894,14 @@ Term Yap_RunTopGoal(Term t, bool handle_errors) {
   UInt arity;
   Term tmod = CurrentModule;
   Term goal_out = 0;
-  LOCAL_PrologMode |= TopGoalMode;
+    YAP_dogoalinfo gi;
+    gi.p = P;
+    gi.cp = CP;
+    gi.b0 = gi.b = LCL0-CellPtr(B);
+    gi.CurSlot = Yap_CurrentHandle();
+    gi.a = LCL0-ASP;
+    gi.e = LCL0-ENV;
+    LOCAL_PrologMode |= TopGoalMode;
 
   t = Yap_YapStripModule(t, &tmod);
   if (IsVarTerm(t)) {
@@ -1963,7 +1971,7 @@ Term Yap_RunTopGoal(Term t, bool handle_errors) {
               "unable to boot because of too little Trail space");
   }
 #endif
-  goal_out = do_goal(CodeAdr, arity, pt, handle_errors PASS_REGS);
+  goal_out = do_goal(CodeAdr, arity, pt, &gi, handle_errors PASS_REGS);
   return goal_out;
 }
 
@@ -2227,6 +2235,7 @@ static Int generate_pred_info(USES_REGS1) {
 
 void Yap_InitYaamRegs(int myworker_id, bool full_reset) {
   Term h0var;
+  YAP_dogoalinfo gi;
   //  getchar();
 #if PUSH_REGS
   /* Guarantee that after a longjmp we go back to the original abstract
@@ -2298,7 +2307,7 @@ void Yap_InitYaamRegs(int myworker_id, bool full_reset) {
   PREG_ADDR = NULL;
 #endif
   cut_c_initialize(myworker_id);
-  Yap_PrepGoal(0, NULL, NULL PASS_REGS);
+  Yap_PrepGoal(0, NULL, &gi PASS_REGS);
 #ifdef FROZEN_STACKS
   H_FZ = HR;
 #ifdef YAPOR_SBA
diff --git a/C/globals.c b/C/globals.c
index 677bd4219..77e0d4868 100644
--- a/C/globals.c
+++ b/C/globals.c
@@ -2048,7 +2048,7 @@ restart:
 
 static Int p_nb_heap_del(USES_REGS1) {
   CELL *qd = GetHeap(ARG1, "deheap");
-  UInt old_sz, qsz;
+  UInt qsz;
   Term arena;
   Term tk, tv;
 
@@ -2060,8 +2060,7 @@ static Int p_nb_heap_del(USES_REGS1) {
   arena = qd[HEAP_ARENA];
   if (arena == 0L)
     return FALSE;
-  old_sz = ArenaSz(arena);
-  /* garbage collection ? */
+                                                              /* garbage collection ? */
   qd[HEAP_SIZE] =MkIntTerm(qsz - 1);
   tk = qd[HEAP_START];
   tv = qd[HEAP_START + 1];
diff --git a/C/yap-args.c b/C/yap-args.c
index 880d6da3c..5a8c5ad80 100755
--- a/C/yap-args.c
+++ b/C/yap-args.c
@@ -1,4 +1,3 @@
-
 /*************************************************************************
  *									 *
  *	 Yap Prolog 							 *
diff --git a/H/Yapproto.h b/H/Yapproto.h
index 1d2a87302..2e27c7f29 100755
--- a/H/Yapproto.h
+++ b/H/Yapproto.h
@@ -208,7 +208,7 @@ extern bool Yap_execute_goal(Term, int, Term, bool);
 extern bool Yap_exec_absmi(bool, yap_reset_t);
 extern void Yap_trust_last(void);
 
-extern void Yap_PrepGoal(UInt, CELL *, choiceptr USES_REGS);
+extern void Yap_PrepGoal(UInt, CELL *, struct goal_info * USES_REGS);
 extern bool Yap_execute_pred(struct pred_entry *ppe, CELL *pt,
                       bool pass_exception USES_REGS);
 extern int Yap_dogc(int extra_args, Term *tp USES_REGS);
diff --git a/include/YapDefs.h b/include/YapDefs.h
index f2af9cadd..b2b684e1e 100755
--- a/include/YapDefs.h
+++ b/include/YapDefs.h
@@ -137,7 +137,7 @@ typedef enum {
 #include "YapInit.h"
 
 /* this should be opaque to the user */
-typedef struct {
+typedef struct goal_info {
   unsigned long b, b0, e, a; //> choice-point at entry
   YAP_handle_t CurSlot; //> variables at entry
   YAP_handle_t EndSlot; //> variables at successful execution