diff --git a/C/amasm.c b/C/amasm.c
index 1bedb0653..0ed3f350a 100644
--- a/C/amasm.c
+++ b/C/amasm.c
@@ -3510,6 +3510,7 @@ do_pass(int pass_no, yamop **entry_codep, int assembling, int *clause_has_blobsp
       if (!ystop_found &&
 	  cip->cpc->nextInst != NULL &&
 	  (cip->cpc->nextInst->op == mark_initialised_pvars_op ||
+	   cip->cpc->nextInst->op == mark_live_regs_op ||
 	   cip->cpc->nextInst->op == blob_op)) {
 	ystop_found = TRUE;
 	code_p = a_il((CELL)*entry_codep, _Ystop, code_p, pass_no, cip);
diff --git a/C/arith1.c b/C/arith1.c
index 86ab48c31..f495bb632 100644
--- a/C/arith1.c
+++ b/C/arith1.c
@@ -418,6 +418,26 @@ eval1(Int fi, Term t) {
       RERROR();
 #endif
     }
+ case op_erf:
+   {
+     Float dbl = get_float(t), out;
+#if HAVE_ERF
+     out = erf(dbl);
+     RFLOAT(out);
+#else
+     RERROR();
+#endif
+   }
+ case op_erfc:
+   {
+     Float dbl = get_float(t), out;
+#if HAVE_ERF
+     out = erfc(dbl);
+     RFLOAT(out);
+#else
+     RERROR();
+#endif
+   }
     /*
       floor(x) maximum integer greatest or equal to X
 
@@ -814,6 +834,8 @@ static InitUnEntry InitUnTab[] = {
   {"float_integer_part", op_fintp},
   {"sign", op_sign},
   {"lgamma", op_lgamma},
+  {"erf",op_erf},
+  {"erfc",op_erfc},
   {"random", op_random1}
 };
 
@@ -879,17 +901,7 @@ p_unary_op_as_integer(void)
     ExpEntry *p;
 
     if (EndOfPAEntr(p = RepExpProp(Yap_GetExpProp(name, 1)))) {
-      Term ti[2];
-
-      /* error */
-      ti[0] = t;
-      ti[1] = MkIntTerm(1);
-      t = Yap_MkApplTerm(FunctorSlash, 2, ti);
-      Yap_Error(TYPE_ERROR_EVALUABLE, t,
-		"functor %s/%d for arithmetic expression",
-		RepAtom(name)->StrOfAE,2);
-      P = FAILCODE;
-      return(FALSE);
+      return Yap_unify(ARG1,ARG2);
     }
     return Yap_unify_constant(ARG2,MkIntTerm(p->FOfEE));
   }
diff --git a/C/arith2.c b/C/arith2.c
index cd4db2f96..250cb5ed6 100644
--- a/C/arith2.c
+++ b/C/arith2.c
@@ -1242,17 +1242,7 @@ p_binary_op_as_integer(void)
     ExpEntry *p;
 
     if (EndOfPAEntr(p = RepExpProp(Yap_GetExpProp(name, 2)))) {
-      Term ti[2];
-
-      /* error */
-      ti[0] = t;
-      ti[1] = MkIntTerm(1);
-      t = Yap_MkApplTerm(FunctorSlash, 2, ti);
-      Yap_Error(TYPE_ERROR_EVALUABLE, t,
-		"functor %s/%d for arithmetic expression",
-		RepAtom(name)->StrOfAE,2);
-      P = FAILCODE;
-      return(FALSE);
+      return Yap_unify(ARG1,ARG2);
     }
     return Yap_unify_constant(ARG2,MkIntTerm(p->FOfEE));
   }
diff --git a/C/c_interface.c b/C/c_interface.c
index f5f69a35f..2a462f378 100644
--- a/C/c_interface.c
+++ b/C/c_interface.c
@@ -364,6 +364,9 @@
 #if !HAVE_STRNCPY
 #define strncpy(X,Y,Z) strcpy(X,Y)
 #endif
+#if !HAVE_STRNCAT
+#define strncat(X,Y,Z) strcat(X,Y)
+#endif
 
 #if defined(_MSC_VER) && defined(YAP_EXPORTS)
 #define X_API __declspec(dllexport)
@@ -2264,6 +2267,25 @@ do_bootfile (char *bootfilename)
 #endif
 }
 
+static void
+construct_init_file(char *boot_file, char *BootFile)
+{
+  /* trust YAPSHAREDIR over YAP_PL_SRCDIR, and notice that the code is / dependent. */
+#if HAVE_GETENV
+  if (getenv("YAPSHAREDIR")) {
+    strncpy(boot_file, getenv("YAPSHAREDIR"), 256);
+    strncat(boot_file, "/pl/", 255);
+  } else {
+#endif
+    strncpy(boot_file, YAP_PL_SRCDIR, 256);
+    strncat(boot_file, "/", 255);
+#if HAVE_GETENV
+  }
+#endif
+  strncat(boot_file, BootFile, 255);
+}
+
+
 /* this routine is supposed to be called from an external program
    that wants to control Yap */
 
@@ -2489,21 +2511,7 @@ YAP_Init(YAP_init_args *yap_init)
 
     /* read the bootfile */
     if (!do_bootstrap) {
-#if HAVE_STRNCAT
-      strncpy(boot_file, YAP_PL_SRCDIR, 256);
-#else
-      strcpy(boot_file, YAP_PL_SRCDIR);
-#endif
-#if HAVE_STRNCAT
-      strncat(boot_file, "/", 255);
-#else
-      strcat(boot_file, "/");
-#endif
-#if HAVE_STRNCAT
-      strncat(boot_file, BootFile, 255);
-#else
-      strcat(boot_file, BootFile);
-#endif
+      construct_init_file(boot_file, BootFile);
       yap_init->YapPrologBootFile = boot_file;
     }
     do_bootfile (yap_init->YapPrologBootFile ? yap_init->YapPrologBootFile : BootFile);
@@ -2513,21 +2521,7 @@ YAP_Init(YAP_init_args *yap_init)
       Atom atfile;
       Functor fgoal;
       YAP_Term goal, as[2];
-#if HAVE_STRNCAT
-      strncpy(init_file, YAP_PL_SRCDIR, 256);
-#else
-      strcpy(init_file, YAP_PL_SRCDIR);
-#endif
-#if HAVE_STRNCAT
-      strncat(init_file, "/", 255);
-#else
-      strcat(init_file, "/");
-#endif
-#if HAVE_STRNCAT
-      strncat(init_file, InitFile, 255);
-#else
-      strcat(init_file, InitFile);
-#endif
+      construct_init_file(init_file, InitFile);
       /* consult init file */
       atfile = Yap_LookupAtom(init_file);
       as[0] = MkAtomTerm(atfile);
diff --git a/C/cmppreds.c b/C/cmppreds.c
index c829f54e9..795b522c5 100644
--- a/C/cmppreds.c
+++ b/C/cmppreds.c
@@ -643,8 +643,11 @@ p_acomp(void)
 {				/* $a_compare(?R,+X,+Y) */
   Term t1 = Deref(ARG1);
   Term t2 = Deref(ARG2);
+  Int out;
 
-  return a_cmp(t1, t2);
+  out = a_cmp(t1, t2);
+  if (ArithError) { Yap_Error(Yap_Error_TYPE, Yap_Error_Term, Yap_ErrorMessage); return FALSE; }
+  return out;
 }
 
 static Int 
@@ -675,42 +678,48 @@ a_eq(Term t1, Term t2)
     }
   }
   out = a_cmp(t1,t2);
-  return !ArithError && (out == 0);
+  if (ArithError) { Yap_Error(Yap_Error_TYPE, Yap_Error_Term, Yap_ErrorMessage); return FALSE; }
+  return out == 0;
 }
 
 static Int 
 a_dif(Term t1, Term t2)
 {
   Int out = a_cmp(Deref(t1),Deref(t2));
-  return !ArithError && out != 0;
+  if (ArithError) { Yap_Error(Yap_Error_TYPE, Yap_Error_Term, Yap_ErrorMessage); return FALSE; }
+  return out != 0;
 }
 
 static Int 
 a_gt(Term t1, Term t2)
 {				/* A > B		 */
   Int out = a_cmp(Deref(t1),Deref(t2));
-  return !ArithError && out > 0;
+  if (ArithError) { Yap_Error(Yap_Error_TYPE, Yap_Error_Term, Yap_ErrorMessage); return FALSE; }
+  return out > 0;
 }
 
 static Int 
 a_ge(Term t1, Term t2)
 {				/* A >= B		 */
   Int out = a_cmp(Deref(t1),Deref(t2));
-  return !ArithError && out >= 0;
+  if (ArithError) { Yap_Error(Yap_Error_TYPE, Yap_Error_Term, Yap_ErrorMessage); return FALSE; }
+  return out >= 0;
 }
 
 static Int 
 a_lt(Term t1, Term t2)
 {				/* A < B       */
   Int out = a_cmp(Deref(t1),Deref(t2));
-  return !ArithError && out < 0;
+  if (ArithError) { Yap_Error(Yap_Error_TYPE, Yap_Error_Term, Yap_ErrorMessage); return FALSE; }
+  return out < 0;
 }
 
 static Int 
 a_le(Term t1, Term t2)
 {				/* A <= B */
   Int out = a_cmp(Deref(t1),Deref(t2));
-  return !ArithError && out <= 0;
+  if (ArithError) { Yap_Error(Yap_Error_TYPE, Yap_Error_Term, Yap_ErrorMessage); return FALSE; }
+  return out <= 0;
 }
 
 
diff --git a/C/exec.c b/C/exec.c
index 91da5760c..b7a14bd5b 100644
--- a/C/exec.c
+++ b/C/exec.c
@@ -1614,8 +1614,8 @@ Yap_InitYaamRegs(void)
 #ifdef SBA
   BSEG =
 #endif /* SBA */
-  BBREG = B_FZ = B_BASE;
-  TR = TR_FZ = TR_BASE;
+  BBREG = B_FZ = (choiceptr) Yap_LocalBase;
+  TR = TR_FZ = (tr_fr_ptr) Yap_TrailBase;
 #endif /* FROZEN_STACKS */
   LOCK(SignalLock);
   CreepFlag = CalculateStackGap();
diff --git a/C/index.c b/C/index.c
index 7b35d8ec7..c89caa756 100644
--- a/C/index.c
+++ b/C/index.c
@@ -3448,7 +3448,7 @@ install_clause(ClauseDef *cls, PredEntry *ap, istack_entry *stack)
 	if (IsExtensionFunctor(f)) {
 	  if (f == FunctorDBRef) {
 	    if (cls->u.t_ptr != sp->extra) break;
-	  } else {
+	  } else if (f == FunctorDouble) {
 	    CELL *pt = RepAppl(sp->extra);
 	    if (cls->u.t_ptr) {
 	      CELL *pt1 = RepAppl(cls->u.t_ptr);
@@ -3461,6 +3461,12 @@ install_clause(ClauseDef *cls, PredEntry *ap, istack_entry *stack)
 #endif
 	      if (t != t1) break;
 	    }
+	  } else {
+	    CELL *pt = RepAppl(sp->extra);
+	    CELL *pt1 = RepAppl(cls->u.t_ptr);
+	    Term t = MkIntTerm(pt[1] & (MAX_ABS_INT-1)),
+	      t1 = MkIntTerm(pt1[1] & (MAX_ABS_INT-1));
+	    if (t != t1) break;
 	  }
 	}
       }
@@ -3610,7 +3616,7 @@ install_log_upd_clause(ClauseDef *cls, PredEntry *ap, istack_entry *stack)
 	if (IsExtensionFunctor(f)) {
 	  if (f == FunctorDBRef) {
 	    if (cls->u.t_ptr != sp->extra) break;
-	  } else {
+	  } else if (f == FunctorDouble) {
 	    CELL *pt = RepAppl(sp->extra);
 	    CELL *pt1 = RepAppl(cls->u.t_ptr);
 #if SIZEOF_DOUBLE == 2*SIZEOF_LONG_INT
@@ -3621,6 +3627,12 @@ install_log_upd_clause(ClauseDef *cls, PredEntry *ap, istack_entry *stack)
 	      t1 = MkIntTerm(pt1[1]);
 #endif
 	    if (t != t1) break;
+	  } else {
+	    CELL *pt = RepAppl(sp->extra);
+	    CELL *pt1 = RepAppl(cls->u.t_ptr);
+	    Term t = MkIntTerm(pt[1] & (MAX_ABS_INT-1)),
+	      t1 = MkIntTerm(pt1[1] & (MAX_ABS_INT-1));
+	    if (t != t1) break;
 	  }
 	}
       }
diff --git a/CLPQR/Makefile.in b/CLPQR/Makefile.in
index 3ff1a7333..27313d4b4 100644
--- a/CLPQR/Makefile.in
+++ b/CLPQR/Makefile.in
@@ -9,7 +9,7 @@ BINDIR = $(ROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 # where YAP should look for architecture-independent Prolog libraries
 #
diff --git a/GPL/Makefile.in b/GPL/Makefile.in
index 2a5df7404..cf245620c 100644
--- a/GPL/Makefile.in
+++ b/GPL/Makefile.in
@@ -9,7 +9,7 @@ BINDIR = $(ROOTDIR)/bin
 #
 # where YAP should look for binary libraries
 #
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 # where YAP should look for architecture-independent Prolog libraries
 #
diff --git a/H/Yap.h b/H/Yap.h
index bebe9127a..d827740df 100644
--- a/H/Yap.h
+++ b/H/Yap.h
@@ -90,7 +90,7 @@
 #undef  USE_THREADED_CODE
 #endif
 #define inline __inline
-#define YAP_VERSION "Yap-6.0.2"
+#define YAP_VERSION "Yap-6.0.3"
 
 #define BIN_DIR "c:\\Yap\\bin"
 #define LIB_DIR "c:\\Yap\\lib\\Yap"
diff --git a/H/eval.h b/H/eval.h
index e1cb2916b..8319e2a4e 100644
--- a/H/eval.h
+++ b/H/eval.h
@@ -93,6 +93,8 @@ typedef enum {
   op_fintp,
   op_sign,
   op_lgamma,
+  op_erf,
+  op_erfc,
   op_random1
 } arith1_op;
 
diff --git a/LGPL/Makefile.in b/LGPL/Makefile.in
index 848616d4a..bec218559 100644
--- a/LGPL/Makefile.in
+++ b/LGPL/Makefile.in
@@ -9,7 +9,7 @@ BINDIR = $(ROOTDIR)/bin
 #
 # where YAP should look for binary libraries
 #
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 # where YAP should look for architecture-independent Prolog libraries
 #
diff --git a/LGPL/clp/Makefile.in b/LGPL/clp/Makefile.in
index 1af5a18f7..1c227209d 100644
--- a/LGPL/clp/Makefile.in
+++ b/LGPL/clp/Makefile.in
@@ -9,7 +9,7 @@ BINDIR = $(ROOTDIR)/bin
 #
 # where YAP should look for binary libraries
 #
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 # where YAP should look for architecture-independent Prolog libraries
 #
diff --git a/LGPL/swi_console/Makefile.in b/LGPL/swi_console/Makefile.in
index 30e373f67..76833a5ea 100644
--- a/LGPL/swi_console/Makefile.in
+++ b/LGPL/swi_console/Makefile.in
@@ -3,12 +3,13 @@
 # (EROOT for architecture-dependent files)
 #
 prefix = @prefix@
+exec_prefix = @exec_prefix@
 ROOTDIR = $(prefix)
 EROOTDIR = @exec_prefix@
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
diff --git a/Makefile.in b/Makefile.in
index c1844a41a..14c2d951e 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,6 +3,7 @@
 # (EROOT for architecture-dependent files)
 #
 prefix = @prefix@
+exec_prefix = @exec_prefix@
 ROOTDIR = $(prefix)
 EROOTDIR = @exec_prefix@
 #
@@ -12,8 +13,8 @@ BINDIR = $(EROOTDIR)/bin
 #
 # where YAP should look for binary libraries
 #
-LIBDIR=$(EROOTDIR)/lib
-YAPLIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@
+YAPLIBDIR=@libdir@/Yap
 #
 # where YAP should look for architecture-independent Prolog libraries
 #
@@ -59,7 +60,7 @@ YAPSTARTUP=startup.yss
 #
 CC=@CC@
 MPI_CC=@MPI_CC@
-CPPFLAGS=@CPPFLAGS@  -I. -I$(srcdir)/H -I$(srcdir)/OPTYap -I$(srcdir)/BEAM -I$(srcdir)/packages/MYDDAS
+CPPFLAGS=@CPPFLAGS@  -I. -I$(srcdir)/H -I$(srcdir)/OPTYap -I$(srcdir)/BEAM -I$(srcdir)/MYDDAS
 CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS)
 C_INTERF_FLAGS= @C_INTERF_FLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS) -I$(srcdir)/include
 C_PARSER_FLAGS= @C_PARSER_FLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS)
@@ -98,7 +99,7 @@ YAPLIB=@YAPLIB@
 #4.1VPATH=@srcdir@:@srcdir@/OPTYap
 CWD=$(PWD)
 #
-VERSION=6.0.2
+VERSION=6.0.3
 MYDDAS_VERSION=MYDDAS-0.9.1
 #
 
@@ -499,7 +500,7 @@ libYap.a: $(LIB_OBJECTS)
 	$(RANLIB) libYap.a
 
 @DYNYAPLIB@: $(LIB_OBJECTS)
-	@DYNLIB_LD@ -o @YAPLIB@ $(LIB_OBJECTS) $(LIBS) $(LDFLGS)
+	@DYNLIB_LD@ -o @YAPLIB@ $(LIB_OBJECTS) $(LIBS) $(LDFLAGS)
 
 install: install_bin install_data
 
diff --git a/OPTYap/opt.init.c b/OPTYap/opt.init.c
index 6dfbae84f..80d9dd5b2 100644
--- a/OPTYap/opt.init.c
+++ b/OPTYap/opt.init.c
@@ -176,7 +176,7 @@ void Yap_init_local(void) {
 #ifdef YAPOR
   /* local data related to or-parallelism */
   LOCAL = REMOTE + worker_id;
-  Set_LOCAL_top_cp(B_BASE);
+  Set_LOCAL_top_cp((choiceptr) Yap_LocalBase);
   LOCAL_top_or_fr = GLOBAL_root_or_fr;
   LOCAL_load = 0;
   LOCAL_share_request = MAX_WORKERS;
@@ -193,7 +193,7 @@ void Yap_init_local(void) {
   LOCAL_top_sg_fr = NULL; 
   LOCAL_top_dep_fr = GLOBAL_root_dep_fr; 
 #ifdef YAPOR
-  Set_LOCAL_top_cp_on_stack(B_BASE); /* ??? */
+  Set_LOCAL_top_cp_on_stack((choiceptr) Yap_LocalBase); /* ??? */
   LOCAL_top_susp_or_fr = GLOBAL_root_or_fr;
 #endif /* YAPOR */
 #endif /* TABLING */
@@ -210,7 +210,7 @@ void make_root_frames(void) {
   INIT_LOCK(OrFr_lock(or_fr));
   OrFr_alternative(or_fr) = NULL;
   BITMAP_copy(OrFr_members(or_fr), GLOBAL_bm_present_workers);
-  SetOrFr_node(or_fr, B_BASE);
+  SetOrFr_node(or_fr, (choiceptr) Yap_LocalBase);
   OrFr_nearest_livenode(or_fr) = NULL;
   OrFr_depth(or_fr) = 0;
   Set_OrFr_pend_prune_cp(or_fr, NULL);
@@ -231,8 +231,9 @@ void make_root_frames(void) {
 
 #ifdef TABLING
   /* root dependency frame */
-  if (!GLOBAL_root_dep_fr)
+  if (!GLOBAL_root_dep_fr) {
     new_dependency_frame(GLOBAL_root_dep_fr, FALSE, NULL, NULL, NULL, NULL, NULL);
+  }
 #endif /* TABLING */
 }
 
diff --git a/OPTYap/opt.macros.h b/OPTYap/opt.macros.h
index 0064feaa4..f52595e2e 100644
--- a/OPTYap/opt.macros.h
+++ b/OPTYap/opt.macros.h
@@ -29,10 +29,6 @@
 
 extern int Yap_page_size;
 
-#define H_BASE   ((CELL *) Yap_GlobalBase)
-#define B_BASE   ((choiceptr) Yap_LocalBase)
-#define TR_BASE  ((tr_fr_ptr) Yap_TrailBase)
-
 #if SIZEOF_INT_P == 4
 #define ALIGN	                   3
 #define ALIGNMASK                  0xfffffffc
diff --git a/OPTYap/opt.preds.c b/OPTYap/opt.preds.c
index 96c15ae61..26b0ecc88 100644
--- a/OPTYap/opt.preds.c
+++ b/OPTYap/opt.preds.c
@@ -65,8 +65,9 @@ static Int p_worker(void);
 #endif /* YAPOR */
 
 #ifdef TABLING
-static Int p_freeze(void);
-static Int p_wake(void);
+static Int p_freeze_choice_point(void);
+static Int p_wake_choice_point(void);
+static Int p_abolish_all_frozen_choice_points(void);
 static Int p_table(void);
 static Int p_tabling_mode(void);
 static Int p_abolish_table(void);
@@ -139,8 +140,9 @@ void Yap_init_optyap_preds(void) {
   Yap_InitCPred("or_statistics", 0, p_or_statistics, SafePredFlag|SyncPredFlag);
 #endif /* YAPOR */
 #ifdef TABLING
-  Yap_InitCPred("freeze_choice_point", 1, p_freeze, SafePredFlag|SyncPredFlag);
-  Yap_InitCPred("wake_choice_point", 1, p_wake, SafePredFlag|SyncPredFlag);
+  Yap_InitCPred("freeze_choice_point", 1, p_freeze_choice_point, SafePredFlag|SyncPredFlag);
+  Yap_InitCPred("wake_choice_point", 1, p_wake_choice_point, SafePredFlag|SyncPredFlag);
+  Yap_InitCPred("abolish_all_frozen_choice_points", 0, p_abolish_all_frozen_choice_points, SafePredFlag|SyncPredFlag);
   Yap_InitCPred("$c_table", 2, p_table, SafePredFlag|SyncPredFlag|HiddenPredFlag);
   Yap_InitCPred("$c_tabling_mode", 3, p_tabling_mode, SafePredFlag|SyncPredFlag|HiddenPredFlag);
   Yap_InitCPred("$c_abolish_table", 2, p_abolish_table, SafePredFlag|SyncPredFlag|HiddenPredFlag);
@@ -552,7 +554,8 @@ Int p_or_statistics(void) {
 
 
 #ifdef TABLING
-static Int p_freeze(void) {
+static
+Int p_freeze_choice_point(void) {
   Term term_arg, term_cp;
 
   term_arg = Deref(ARG1);
@@ -565,7 +568,8 @@ static Int p_freeze(void) {
 }
 
 
-static Int p_wake(void) {
+static
+Int p_wake_choice_point(void) {
   Term term_arg;
 
   term_arg = Deref(ARG1);
@@ -577,6 +581,13 @@ static Int p_wake(void) {
 }
 
 
+static
+Int p_abolish_all_frozen_choice_points(void) {
+  abolish_all_frozen_cps();
+  return (TRUE);
+}
+
+
 static
 Int p_table(void) {
   Term mod, t;
diff --git a/OPTYap/or.cowengine.c b/OPTYap/or.cowengine.c
index 3ac324071..4bf967cb0 100644
--- a/OPTYap/or.cowengine.c
+++ b/OPTYap/or.cowengine.c
@@ -79,7 +79,7 @@ void make_root_choice_point(void) {
 
 void free_root_choice_point(void) {
   B = LOCAL_top_cp->cp_b;
-  LOCAL_top_cp = B_BASE;
+  LOCAL_top_cp = (choiceptr) Yap_LocalBase;
   return;
 }
 
diff --git a/OPTYap/or.engine.c b/OPTYap/or.engine.c
index 6bb5ed7f9..f0ac8a2d7 100644
--- a/OPTYap/or.engine.c
+++ b/OPTYap/or.engine.c
@@ -123,7 +123,7 @@ void free_root_choice_point(void) {
 #ifdef TABLING
   LOCAL_top_cp_on_stack =
 #endif /* TABLING */
-  LOCAL_top_cp = GLOBAL_root_cp = OrFr_node(GLOBAL_root_or_fr) = B_BASE;
+  LOCAL_top_cp = GLOBAL_root_cp = OrFr_node(GLOBAL_root_or_fr) = (choiceptr) Yap_LocalBase;
   return;
 }
 
@@ -224,13 +224,13 @@ int q_share_work(int worker_p) {
       RESET_VARIABLE(aux_cell);
 #ifdef TABLING
     } else if (IsPairTerm(aux_cell)) {
-      /* avoid frozen segments */
       aux_cell = (CELL) RepPair(aux_cell);
-      if ((ADDR) aux_cell >= TrailBase) {
+      if (IN_BETWEEN(Yap_TrailBase, aux_cell, Yap_TrailTop)) {
+	/* avoid frozen segments */
         TR = (tr_fr_ptr) aux_cell;
 #ifdef TABLING_ERRORS
-        if (TR > (tr_fr_ptr) TrailTop)
-          TABLING_ERROR_MESSAGE("TR > TrailTop (q_share_work)");
+        if (TR > (tr_fr_ptr) Yap_TrailTop)
+          TABLING_ERROR_MESSAGE("TR > Yap_TrailTop (q_share_work)");
         if (TR < aux_tr)
           TABLING_ERROR_MESSAGE("TR < aux_tr (q_share_work)");
 #endif /* TABLING_ERRORS */
@@ -338,9 +338,9 @@ sync_with_p:
       }
 #ifdef TABLING 
     } else if (IsPairTerm(aux_cell)) {
-      /* avoid frozen segments */
       aux_cell = (CELL) RepPair(aux_cell);
-      if ((ADDR) aux_cell >= TrailBase)
+      if (IN_BETWEEN(Yap_TrailBase, aux_cell, Yap_TrailTop)) {
+        /* avoid frozen segments */
         aux_tr = (tr_fr_ptr) aux_cell;
 #endif /* TABLING */
 #ifdef MULTI_ASSIGNMENT_VARIABLES
diff --git a/OPTYap/or.sbaengine.c b/OPTYap/or.sbaengine.c
index 28dc49391..36c686e5c 100644
--- a/OPTYap/or.sbaengine.c
+++ b/OPTYap/or.sbaengine.c
@@ -103,9 +103,9 @@ void make_root_choice_point(void) {
   LOCAL_load = 0;
   LOCAL_prune_request = NULL;
   BRANCH(worker_id, 0) = 0;
-  H_FZ = H_BASE;
-  B_FZ = B_BASE;
-  TR_FZ = TR_BASE;
+  H_FZ = (CELL *) Yap_GlobalBase;
+  B_FZ = (choiceptr) Yap_LocalBase;
+  TR_FZ = (tr_fr_ptr) Yap_TrailBase;
 }
 
 
@@ -113,10 +113,10 @@ void free_root_choice_point(void) {
   reset_trail(LOCAL_top_cp->cp_tr, TR);
   TR = LOCAL_top_cp->cp_tr;
   B = LOCAL_top_cp->cp_b;
-  LOCAL_top_cp = B_BASE;
-  H_FZ = H_BASE;
-  B_FZ = B_BASE;
-  TR_FZ = TR_BASE;
+  LOCAL_top_cp = (choiceptr) Yap_LocalBase;
+  H_FZ = (CELL *) Yap_GlobalBase;
+  B_FZ = (choiceptr) Yap_LocalBase;
+  TR_FZ = (tr_fr_ptr) Yap_TrailBase;
 }
 
 
diff --git a/OPTYap/or.threadengine.c b/OPTYap/or.threadengine.c
index 194d75946..62dc5774f 100644
--- a/OPTYap/or.threadengine.c
+++ b/OPTYap/or.threadengine.c
@@ -96,11 +96,11 @@ void make_root_choice_point(void) {
 void free_root_choice_point(void) {
   B = Get_LOCAL_top_cp()->cp_b;
 #ifdef TABLING
-  Set_LOCAL_top_cp_on_stack(B_BASE);
+  Set_LOCAL_top_cp_on_stack((choiceptr) Yap_LocalBase);
 #endif /* TABLING */
-  Set_GLOBAL_root_cp( B_BASE );
-  Set_LOCAL_top_cp( B_BASE );
-  SetOrFr_node(GLOBAL_root_or_fr, B_BASE);
+  Set_GLOBAL_root_cp((choiceptr) Yap_LocalBase);
+  Set_LOCAL_top_cp((choiceptr) Yap_LocalBase);
+  SetOrFr_node(GLOBAL_root_or_fr, (choiceptr) Yap_LocalBase);
   return;
 }
 
diff --git a/OPTYap/tab.macros.h b/OPTYap/tab.macros.h
index 3431b0ecd..da22d394f 100644
--- a/OPTYap/tab.macros.h
+++ b/OPTYap/tab.macros.h
@@ -35,6 +35,7 @@ STD_PROTO(static inline void free_subgoal_trie_hash_chain, (sg_hash_ptr));
 STD_PROTO(static inline void free_answer_trie_hash_chain, (ans_hash_ptr));
 STD_PROTO(static inline choiceptr freeze_current_cp, (void));
 STD_PROTO(static inline void resume_frozen_cp, (choiceptr));
+STD_PROTO(static inline void abolish_all_frozen_cps, (void));
 
 #ifdef YAPOR
 STD_PROTO(static inline void pruning_over_tabling_data_structures, (void));
@@ -491,7 +492,7 @@ void unbind_variables(tr_fr_ptr unbind_tr, tr_fr_ptr end_tr) {
       RESET_VARIABLE(ref);
     } else if (IsPairTerm(ref)) {
       ref = (CELL) RepPair(ref);
-      if ((ADDR)ref >= Yap_TrailBase) {
+      if (IN_BETWEEN(Yap_TrailBase, ref, Yap_TrailTop)) {
         /* avoid frozen segments */
         unbind_tr = (tr_fr_ptr) ref;
 #ifdef TABLING_ERRORS
@@ -530,7 +531,7 @@ void rebind_variables(tr_fr_ptr rebind_tr, tr_fr_ptr end_tr) {
       *((CELL *)ref) = TrailVal(rebind_tr);
     } else if (IsPairTerm(ref)) {
       ref = (CELL) RepPair(ref);
-      if ((ADDR)ref >= Yap_TrailBase) {
+      if (IN_BETWEEN(Yap_TrailBase, ref, Yap_TrailTop)) {
         /* avoid frozen segments */
   	rebind_tr = (tr_fr_ptr) ref;
 #ifdef TABLING_ERRORS
@@ -574,7 +575,8 @@ void restore_bindings(tr_fr_ptr unbind_tr, tr_fr_ptr rebind_tr) {
         RESET_VARIABLE(ref);
       } else if (IsPairTerm(ref)) {
         ref = (CELL) RepPair(ref);
-        if ((ADDR)ref >= Yap_TrailBase) {
+	if (IN_BETWEEN(Yap_TrailBase, ref, Yap_TrailTop)) {
+	  /* avoid frozen segments */
           unbind_tr = (tr_fr_ptr) ref;
 #ifdef TABLING_ERRORS
           if (unbind_tr > (tr_fr_ptr) Yap_TrailTop)
@@ -600,7 +602,8 @@ void restore_bindings(tr_fr_ptr unbind_tr, tr_fr_ptr rebind_tr) {
       ref = (CELL) TrailTerm(--end_tr);
       if (IsPairTerm(ref)) {
         ref = (CELL) RepPair(ref);
-        if ((ADDR)ref >= Yap_TrailBase) {
+	if (IN_BETWEEN(Yap_TrailBase, ref, Yap_TrailTop)) {
+	  /* avoid frozen segments */
   	  end_tr = (tr_fr_ptr) ref;
 #ifdef TABLING_ERRORS
 	  if (end_tr > (tr_fr_ptr) Yap_TrailTop)
@@ -617,7 +620,8 @@ void restore_bindings(tr_fr_ptr unbind_tr, tr_fr_ptr rebind_tr) {
       *((CELL *)ref) = TrailVal(rebind_tr);
     } else if (IsPairTerm(ref)) {
       ref = (CELL) RepPair(ref);
-      if ((ADDR)ref >= Yap_TrailBase) {
+      if (IN_BETWEEN(Yap_TrailBase, ref, Yap_TrailTop)) {
+	/* avoid frozen segments */
         rebind_tr = (tr_fr_ptr) ref;
 #ifdef TABLING_ERRORS
 	if (rebind_tr > (tr_fr_ptr) Yap_TrailTop)
@@ -815,6 +819,15 @@ void resume_frozen_cp(choiceptr frozen_cp) {
 }
 
 
+static inline
+void abolish_all_frozen_cps(void) {
+  B_FZ  = (choiceptr) Yap_LocalBase;
+  H_FZ  = (CELL *) Yap_GlobalBase;
+  TR_FZ = (tr_fr_ptr) Yap_TrailBase;
+  return;
+}
+
+
 #ifdef YAPOR
 static inline
 void pruning_over_tabling_data_structures(void) {
diff --git a/config.h.in b/config.h.in
index 7c353fe5c..772d08d30 100755
--- a/config.h.in
+++ b/config.h.in
@@ -160,6 +160,7 @@
 #undef  HAVE_CTIME
 #undef  HAVE_DLOPEN
 #undef  HAVE_DUP2
+#undef  HAVE_ERF
 #undef  HAVE_FECLEAREXCEPT
 #undef  HAVE_FESETTRAPENABLE
 #undef  HAVE_FETESTEXCEPT
diff --git a/configure b/configure
index 3aff7acf8..0273a7208 100755
--- a/configure
+++ b/configure
@@ -734,7 +734,6 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
-enable_cut_c
 enable_tabling
 enable_or_parallelism
 enable_rational_trees
@@ -1401,7 +1400,6 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
- --enable-cut-c             support for executing c code when a cut occurs
  --enable-tabling           support tabling
  --enable-or-parallelism    support or-parallelism as: env-copy,sba,a-cow
  --enable-rational-trees    support infinite rational trees
@@ -3552,13 +3550,6 @@ done
 
 
 
-# Check whether --enable-cut-c was given.
-if test "${enable_cut_c+set}" = set; then :
-  enableval=$enable_cut_c; cutc="$enableval"
-else
-  cutc=no
-fi
-
 # Check whether --enable-tabling was given.
 if test "${enable_tabling+set}" = set; then :
   enableval=$enable_tabling; tabling="$enableval"
@@ -5482,25 +5473,6 @@ $as_echo "$yap_cv_odbc" >&6; }
 	    	echo "-------------------------------"
 	    	exit
 	fi
-
-	if test "$cutc" = no
-	then
-		echo
-		echo
-		echo "********************************************************"
-		echo
-		echo
-		echo "!!!!!! WARNING !!!!!!"
-		echo "The MYDDAS interface makes no sense without cut-c"
-		echo "Please contact tiagosoares@ncc.up.pt for help"
-		echo
-		echo "Enabling cut-c"
-		echo
-		echo "********************************************************"
-		echo
-		echo
-		cutc="yes"
-	fi
 fi
 
 if test "$myddasstats" = "yes"
@@ -6899,7 +6871,7 @@ then
     YAPLIB="$DYNYAPLIB"
     DYNLIB_LD="$CC -dynamiclib -Wl,-install_name,$prefix/lib/libYap.dylib"
     PRE_DYNLOADER_PATH="DYLD_LIBRARY_PATH=\$(abs_top_builddir)"
-    EXTEND_DYNLOADER_PATH="DYLD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPBOOTDIR=\$(DESTDIR)\$(SHAREDIR)/pl  YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
+    EXTEND_DYNLOADER_PATH="DYLD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
 #    CROSS_SIMULATOR="DYLD_LIBRARY_PATH=."
     ;;
   *)
@@ -6914,7 +6886,7 @@ then
         JAVA_TARGET=sparc
         ;;
        esac
-    EXTEND_DYNLOADER_PATH="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPBOOTDIR=\$(DESTDIR)\$(SHAREDIR)/pl YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
+    EXTEND_DYNLOADER_PATH="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
     PRE_DYNLOADER_PATH="LD_LIBRARY_PATH=\$(abs_top_builddir)"
     LDFLAGS="$LDFLAGS -Wl,-R,$JAVA_HOME/jre/lib/$JAVA_TARGET"
     DYNYAPLIB=libYap"$SHLIB_SUFFIX"
@@ -6923,7 +6895,7 @@ then
   esac
 else
   PRE_DYNLOADER_PATH=""
-  EXTEND_DYNLOADER_PATH="YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPBOOTDIR=\$(DESTDIR)\$(SHAREDIR)/pl  YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
+  EXTEND_DYNLOADER_PATH="YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
   DYNYAPLIB=libYap.notused
 fi
 
@@ -8499,12 +8471,14 @@ _ACEOF
 fi
 done
 
-for ac_func in feclearexcept
+for ac_func in erf feclearexcept
 do :
-  ac_fn_c_check_func "$LINENO" "feclearexcept" "ac_cv_func_feclearexcept"
-if test "x$ac_cv_func_feclearexcept" = x""yes; then :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_FECLEAREXCEPT 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
diff --git a/configure.in b/configure.in
index d9b656da9..1f4ea7265 100755
--- a/configure.in
+++ b/configure.in
@@ -17,9 +17,6 @@ AC_SUBST(GCC)
 AC_SUBST(C_INTERF_FLAGS)
 AC_SUBST(C_PARSER_FLAGS)
 
-AC_ARG_ENABLE(cut-c,
-	[ --enable-cut-c             support for executing c code when a cut occurs ],
-	cutc="$enableval", cutc=no)
 AC_ARG_ENABLE(tabling,
 	[ --enable-tabling           support tabling ],
 	tabling="$enableval", tabling=no)
@@ -615,25 +612,6 @@ then
 	    	echo "-------------------------------"
 	    	exit
 	fi
-
-	if test "$cutc" = no
-	then
-		echo
-		echo
-		echo "********************************************************"
-		echo
-		echo
-		echo "!!!!!! WARNING !!!!!!"
-		echo "The MYDDAS interface makes no sense without cut-c"
-		echo "Please contact tiagosoares@ncc.up.pt for help"
-		echo 
-		echo "Enabling cut-c"
-		echo
-		echo "********************************************************"
-		echo
-		echo
-		cutc="yes"
-	fi
 fi	
 
 if test "$myddasstats" = "yes"
@@ -1038,7 +1016,7 @@ then
     YAPLIB="$DYNYAPLIB"
     DYNLIB_LD="$CC -dynamiclib -Wl,-install_name,$prefix/lib/libYap.dylib"
     PRE_DYNLOADER_PATH="DYLD_LIBRARY_PATH=\$(abs_top_builddir)"
-    EXTEND_DYNLOADER_PATH="DYLD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPBOOTDIR=\$(DESTDIR)\$(SHAREDIR)/pl  YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
+    EXTEND_DYNLOADER_PATH="DYLD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
 #    CROSS_SIMULATOR="DYLD_LIBRARY_PATH=."
     ;;
   *)
@@ -1053,7 +1031,7 @@ then
         JAVA_TARGET=sparc
         ;;
        esac
-    EXTEND_DYNLOADER_PATH="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPBOOTDIR=\$(DESTDIR)\$(SHAREDIR)/pl YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
+    EXTEND_DYNLOADER_PATH="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
     PRE_DYNLOADER_PATH="LD_LIBRARY_PATH=\$(abs_top_builddir)"
     LDFLAGS="$LDFLAGS -Wl,-R,$JAVA_HOME/jre/lib/$JAVA_TARGET"
     DYNYAPLIB=libYap"$SHLIB_SUFFIX"
@@ -1062,7 +1040,7 @@ then
   esac
 else
   PRE_DYNLOADER_PATH=""
-  EXTEND_DYNLOADER_PATH="YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPBOOTDIR=\$(DESTDIR)\$(SHAREDIR)/pl  YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
+  EXTEND_DYNLOADER_PATH="YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
   DYNYAPLIB=libYap.notused
 fi
 
@@ -1501,7 +1479,7 @@ dnl Checks for library functions.
 AC_TYPE_SIGNAL
 AC_CHECK_FUNCS(access)
 AC_CHECK_FUNCS(acosh asinh atanh chdir ctime dlopen dup2)
-AC_CHECK_FUNCS(feclearexcept)
+AC_CHECK_FUNCS(erf feclearexcept)
 AC_CHECK_FUNCS(fesettrapenable fgetpos finite fpclass ftime getcwd getenv)
 AC_CHECK_FUNCS(gethostbyname gethostid gethostname)
 AC_CHECK_FUNCS(gethrtime getpagesize)
diff --git a/docs/yap.tex b/docs/yap.tex
index c5f74031f..b5d4701e8 100644
--- a/docs/yap.tex
+++ b/docs/yap.tex
@@ -8,7 +8,7 @@ a\input texinfo @c -*- mode: texinfo; coding: latin-1; -*-
 @c @setchapternewpage odd
 @c %**end of header
 
-@set VERSION 6.0.2
+@set VERSION 6.0.3
 @set EDITION 4.2.6
 @set UPDATED Feb 2010
 
@@ -3849,6 +3849,12 @@ Hyperbolic arc tangent.
 @item lgamma(@var{X})
 gamma function.
 
+@item erf(@var{X})
+gaussian error function.
+
+@item erfc(@var{X})
+complementary gaussian error function.
+
 @item random(@var{X}) [ISO]
 An integer random number between 0 and @var{X}.
 
diff --git a/library/Makefile.in b/library/Makefile.in
index 5dd3d578c..ece4339ed 100644
--- a/library/Makefile.in
+++ b/library/Makefile.in
@@ -9,7 +9,7 @@ BINDIR = $(ROOTDIR)/bin
 #
 # where YAP should look for binary libraries
 #
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 # where YAP should look for architecture-independent Prolog libraries
 #
diff --git a/library/atts.yap b/library/atts.yap
index c3476f09b..e76d91b57 100644
--- a/library/atts.yap
+++ b/library/atts.yap
@@ -15,9 +15,7 @@
 *									 *
 *************************************************************************/
 
-:- module(attributes, []).
-
-:- op(1150, fx, attribute).
+:- module(attributes, [op(1150, fx, attribute)]).
 
 :- multifile
 	user:goal_expansion/3.
diff --git a/library/cleanup.yap b/library/cleanup.yap
index 5023056b1..f2aeb3cf2 100644
--- a/library/cleanup.yap
+++ b/library/cleanup.yap
@@ -29,17 +29,17 @@
 % Read the Source.
 
 :- module( cleanup, [
-		call_cleanup/2,
-		call_cleanup/1,
-		on_cleanup/1,
-		cleanup_all/0
-	]).
+		     call_cleanup/2,
+		     call_cleanup/1,
+		     on_cleanup/1,
+		     cleanup_all/0,
+		     op(1150, fx,fragile)
+		    ]).
 
 
 :- multifile user:goal_expansion/3.
 
 :- user_defined_directive(fragile(G), cleanup:cleanup_expansion(G)).
-:- op(1150, fx,fragile).
 
 :- meta_predicate
 	call_cleanup(:,:),
diff --git a/library/lammpi/Makefile.in b/library/lammpi/Makefile.in
index 5893f07ff..301b22ade 100644
--- a/library/lammpi/Makefile.in
+++ b/library/lammpi/Makefile.in
@@ -7,7 +7,8 @@
 # (EROOT for architecture-dependent files)
 #
 prefix = @prefix@
-ROOTDIR = $(prefix)
+exec_prefix = @exec_prefix@
+OOTDIR = $(prefix)
 EROOTDIR = @exec_prefix@
 abs_top_builddir = @abs_top_builddir@
 #
@@ -17,7 +18,7 @@ BINDIR = $(EROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
diff --git a/library/matlab/Makefile.in b/library/matlab/Makefile.in
index efd14f2c2..147df354d 100644
--- a/library/matlab/Makefile.in
+++ b/library/matlab/Makefile.in
@@ -3,6 +3,7 @@
 # (EROOT for architecture-dependent files)
 #
 prefix = @prefix@
+exec_prefix = @exec_prefix@
 ROOTDIR = $(prefix)
 EROOTDIR = @exec_prefix@
 abs_top_builddir = @abs_top_builddir@
@@ -13,7 +14,7 @@ BINDIR = $(EROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
diff --git a/library/matrices/Makefile.in b/library/matrices/Makefile.in
index 82e9ba729..6720f3935 100644
--- a/library/matrices/Makefile.in
+++ b/library/matrices/Makefile.in
@@ -3,6 +3,7 @@
 # (EROOT for architecture-dependent files)
 #
 prefix = @prefix@
+exec_prefix = @exec_prefix@
 ROOTDIR = $(prefix)
 EROOTDIR = @exec_prefix@
 abs_top_builddir = @abs_top_builddir@
@@ -13,7 +14,7 @@ BINDIR = $(EROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
diff --git a/library/matrix/Makefile.in b/library/matrix/Makefile.in
index 82e9ba729..6720f3935 100644
--- a/library/matrix/Makefile.in
+++ b/library/matrix/Makefile.in
@@ -3,6 +3,7 @@
 # (EROOT for architecture-dependent files)
 #
 prefix = @prefix@
+exec_prefix = @exec_prefix@
 ROOTDIR = $(prefix)
 EROOTDIR = @exec_prefix@
 abs_top_builddir = @abs_top_builddir@
@@ -13,7 +14,7 @@ BINDIR = $(EROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
diff --git a/library/mpi/Makefile.in b/library/mpi/Makefile.in
index 6c8cba93a..efd87a718 100644
--- a/library/mpi/Makefile.in
+++ b/library/mpi/Makefile.in
@@ -11,6 +11,7 @@
 # (EROOT for architecture-dependent files)
 #
 prefix = @prefix@
+exec_prefix = @exec_prefix@
 ROOTDIR = $(prefix)
 EROOTDIR = @exec_prefix@
 abs_top_builddir = @abs_top_builddir@
@@ -21,8 +22,8 @@ BINDIR = $(EROOTDIR)/bin
 #
 # where YAP should look for binary libraries
 #
-LIBDIR=$(EROOTDIR)/lib
-YAPLIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@
+YAPLIBDIR=@libdir@/Yap
 #
 # where YAP should look for architecture-independent Prolog libraries
 #
diff --git a/library/mpi/mpi.c b/library/mpi/mpi.c
index d26cf0c17..8ada34123 100644
--- a/library/mpi/mpi.c
+++ b/library/mpi/mpi.c
@@ -26,9 +26,6 @@ static char *rcsid = "$Header: /Users/vitor/Yap/yap-cvsbackup/library/mpi/mpi.c,
 #include "Yatom.h"
 #include "yapio.h"
 
-/* for AtomEof */
-#include "Heap.h"
-
 #include <stdlib.h>
 #include <string.h>
 #include <mpi.h>
diff --git a/library/random/Makefile.in b/library/random/Makefile.in
index 670806630..3b7212b5c 100644
--- a/library/random/Makefile.in
+++ b/library/random/Makefile.in
@@ -3,6 +3,7 @@
 # (EROOT for architecture-dependent files)
 #
 prefix = @prefix@
+exec_prefix = @exec_prefix@
 ROOTDIR = $(prefix)
 EROOTDIR = @exec_prefix@
 abs_top_builddir = @abs_top_builddir@
@@ -13,7 +14,7 @@ BINDIR = $(EROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
diff --git a/library/regex/Makefile.in b/library/regex/Makefile.in
index 7c6aecfea..109b1112f 100644
--- a/library/regex/Makefile.in
+++ b/library/regex/Makefile.in
@@ -3,6 +3,7 @@
 # (EROOT for architecture-dependent files)
 #
 prefix = @prefix@
+exec_prefix = @exec_prefix@
 ROOTDIR = $(prefix)
 EROOTDIR = @exec_prefix@
 abs_top_builddir = @abs_top_builddir@
@@ -13,7 +14,7 @@ BINDIR = $(EROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
diff --git a/library/rltree/Makefile.in b/library/rltree/Makefile.in
index c1752e328..72ebf95c0 100644
--- a/library/rltree/Makefile.in
+++ b/library/rltree/Makefile.in
@@ -7,6 +7,7 @@
 # (EROOT for architecture-dependent files)
 #
 prefix = @prefix@
+exec_prefix = @exec_prefix@
 ROOTDIR = $(prefix)
 EROOTDIR = @exec_prefix@
 abs_top_builddir = @abs_top_builddir@
@@ -17,7 +18,7 @@ BINDIR = $(EROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
diff --git a/library/system/Makefile.in b/library/system/Makefile.in
index 7c92b60a1..94190010c 100644
--- a/library/system/Makefile.in
+++ b/library/system/Makefile.in
@@ -3,6 +3,7 @@
 # (EROOT for architecture-dependent files)
 #
 prefix = @prefix@
+exec_prefix = @exec_prefix@
 ROOTDIR = $(prefix)
 EROOTDIR = @exec_prefix@
 abs_top_builddir = @abs_top_builddir@
@@ -13,7 +14,7 @@ BINDIR = $(EROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
diff --git a/library/terms.yap b/library/terms.yap
index 66d79dbbd..682215ccf 100644
--- a/library/terms.yap
+++ b/library/terms.yap
@@ -16,17 +16,19 @@
 *************************************************************************/
 
 :- module(terms, [
-	term_hash/2,
-	term_hash/4,
-	instantiated_term_hash/4,
-	variant/2,
-	unifiable/3,
-	subsumes/2,
-	subsumes_chk/2,
-        cyclic_term/1,
-        acyclic_term/1,
-        variable_in_term/2
-    ]).
+		  term_hash/2,
+		  term_hash/4,
+		  instantiated_term_hash/4,
+		  variant/2,
+		  unifiable/3,
+		  subsumes/2,
+		  subsumes_chk/2,
+		  cyclic_term/1,
+		  acyclic_term/1,
+		  variable_in_term/2,
+		  variables_within_term/3,
+		  new_variables_in_term/3
+		 ]).
 
 term_hash(T,H) :-
 	term_hash(T, -1, 33554432, H).
diff --git a/library/tries/Makefile.in b/library/tries/Makefile.in
index 28c24f7e9..8b86f79b5 100644
--- a/library/tries/Makefile.in
+++ b/library/tries/Makefile.in
@@ -3,6 +3,7 @@
 # (EROOT for architecture-dependent files)
 #
 prefix = @prefix@
+exec_prefix = @exec_prefix@
 ROOTDIR = $(prefix)
 EROOTDIR = @exec_prefix@
 abs_top_builddir = @abs_top_builddir@
@@ -13,7 +14,7 @@ BINDIR = $(EROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
diff --git a/library/yap2swi/Makefile.in b/library/yap2swi/Makefile.in
index e768a3710..121fc213c 100644
--- a/library/yap2swi/Makefile.in
+++ b/library/yap2swi/Makefile.in
@@ -13,7 +13,7 @@ BINDIR = $(EROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
diff --git a/misc/Yap.spec b/misc/Yap.spec
index 33e31d331..f94c61afc 100644
--- a/misc/Yap.spec
+++ b/misc/Yap.spec
@@ -3,7 +3,7 @@
 
 Name: Yap
 Summary: Prolog Compiler
-Version: 6.0.2
+Version: 6.0.3
 Packager: Vitor Santos Costa <vitor@cos.ufrj.br>
 Release: 1
 Source: http://www.dcc.fc.up.pt/~vsc/Yap/%{name}-%{version}.tar.gz
diff --git a/misc/yap.nsi b/misc/yap.nsi
index 3c5d576e9..a00ba3687 100755
--- a/misc/yap.nsi
+++ b/misc/yap.nsi
@@ -268,4 +268,4 @@ Function .onInstFailed
 		    installer, please contact yap-users@sf.net"
 FunctionEnd
 
-outfile "yap-6.0.2-installer.exe"
+outfile "yap-6.0.3-installer.exe"
diff --git a/packages/CLPBN/Makefile.in b/packages/CLPBN/Makefile.in
index 87a1dd21f..3230bf51f 100644
--- a/packages/CLPBN/Makefile.in
+++ b/packages/CLPBN/Makefile.in
@@ -9,7 +9,7 @@ BINDIR = $(ROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 # where YAP should look for architecture-independent Prolog libraries
 #
diff --git a/packages/CLPBN/clpbn.yap b/packages/CLPBN/clpbn.yap
index 9f75234e8..c5090bdcb 100644
--- a/packages/CLPBN/clpbn.yap
+++ b/packages/CLPBN/clpbn.yap
@@ -9,14 +9,13 @@
 		  clpbn_run_solver/3,
 		  clpbn_init_solver/5,
 		  clpbn_run_solver/4,
-		  clpbn_init_graph/1]).
+		  clpbn_init_graph/1,
+		  op( 500, xfy, with)]).
 
 :- use_module(library(atts)).
 :- use_module(library(lists)).
 :- use_module(library(terms)).
 
-:- op( 500, xfy, with).
-
 %
 % avoid the overhead of using goal_expansion/2.
 %
diff --git a/packages/PLStream/Makefile.in b/packages/PLStream/Makefile.in
index 0f6eb492a..7bdbc8c70 100755
--- a/packages/PLStream/Makefile.in
+++ b/packages/PLStream/Makefile.in
@@ -4,6 +4,7 @@
 #
 GCC=@GCC@
 prefix = @prefix@
+exec_prefix = @exec_prefix@
 ROOTDIR = $(prefix)
 EROOTDIR = @exec_prefix@
 abs_top_builddir = @abs_top_builddir@
@@ -14,7 +15,7 @@ BINDIR = $(EROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
diff --git a/packages/ProbLog/Makefile.in b/packages/ProbLog/Makefile.in
index b61d8a9ee..220b44d02 100644
--- a/packages/ProbLog/Makefile.in
+++ b/packages/ProbLog/Makefile.in
@@ -9,7 +9,7 @@ BINDIR = $(ROOTDIR)/bin
 #
 # where YAP should look for binary libraries
 #
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 # where YAP should look for architecture-independent Prolog libraries
 #
diff --git a/packages/ProbLog/simplecudd/Makefile.in b/packages/ProbLog/simplecudd/Makefile.in
index e11a3559f..17be51be2 100644
--- a/packages/ProbLog/simplecudd/Makefile.in
+++ b/packages/ProbLog/simplecudd/Makefile.in
@@ -3,6 +3,7 @@
 # (EROOT for architecture-dependent files)
 #
 prefix = @prefix@
+exec_prefix = @exec_prefix@
 ROOTDIR = $(prefix)
 EROOTDIR = @exec_prefix@
 abs_top_builddir = @abs_top_builddir@
@@ -13,7 +14,7 @@ BINDIR = $(EROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
diff --git a/packages/chr b/packages/chr
index f6bb78212..91ad6583a 160000
--- a/packages/chr
+++ b/packages/chr
@@ -1 +1 @@
-Subproject commit f6bb7821268b5c6df1ce83a9d60af1f90a9dd673
+Subproject commit 91ad6583a1387ad6c645c46f258fd671d92fe9fb
diff --git a/packages/clpqr b/packages/clpqr
index e3ee70d59..dc903cf88 160000
--- a/packages/clpqr
+++ b/packages/clpqr
@@ -1 +1 @@
-Subproject commit e3ee70d5971a5af8c9a2a3a5fe8a1892c3777f2b
+Subproject commit dc903cf885614c5caef0411dcf35c650d4f290b4
diff --git a/packages/cplint/Makefile.in b/packages/cplint/Makefile.in
index 47f9ef139..7a6e3ec2c 100644
--- a/packages/cplint/Makefile.in
+++ b/packages/cplint/Makefile.in
@@ -12,7 +12,7 @@ BINDIR = $(ROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 # where YAP should look for architecture-independent Prolog libraries
 #
diff --git a/packages/cplint/doc/Makefile b/packages/cplint/doc/Makefile
new file mode 100644
index 000000000..786d90969
--- /dev/null
+++ b/packages/cplint/doc/Makefile
@@ -0,0 +1,8 @@
+
+manual.pdf: manual.tex manual.bbl
+	pdflatex manual
+	pdflatex manual
+
+manual.html: manual.tex manual.bbl
+	htlatex manual
+
diff --git a/packages/jpl b/packages/jpl
index 9f80255cc..cb4b29949 160000
--- a/packages/jpl
+++ b/packages/jpl
@@ -1 +1 @@
-Subproject commit 9f80255cce18ee268792631aa1180e19a496346f
+Subproject commit cb4b299493f80d424dcd19f1928ebb2e0203bdb2
diff --git a/packages/plunit/Makefile.in b/packages/plunit/Makefile.in
index 8d7e9590e..185362b15 100644
--- a/packages/plunit/Makefile.in
+++ b/packages/plunit/Makefile.in
@@ -11,15 +11,16 @@ SHELL=@SHELL@
 ifeq (@PROLOG_SYSTEM@,yap)
 
 prefix = @prefix@
+exec_prefix = @exec_prefix@
 ROOTDIR = $(prefix)
 EROOTDIR = @exec_prefix@
 
 srcdir=@srcdir@
 
 BINDIR = $(EROOTDIR)/bin
-LIBDIR=$(EROOTDIR)/lib
+LIBDIR=@libdir@
 SHAREDIR=$(EROOTDIR)/share/Yap
-YAPLIBDIR=$(EROOTDIR)/lib/Yap
+YAPLIBDIR=@libdir@/Yap
 
 PL=@EXTEND_DYNLOADER_PATH@ $(DESTDIR)$(BINDIR)/yap $(DESTDIR)$(YAPLIBDIR)/startup.yss
 LN_S=@LN_S@
diff --git a/packages/sgml/Makefile.in b/packages/sgml/Makefile.in
index 7f5809be2..ee7d1dfa5 100644
--- a/packages/sgml/Makefile.in
+++ b/packages/sgml/Makefile.in
@@ -9,6 +9,7 @@
 ifeq (@PROLOG_SYSTEM@,yap)
 
 prefix = @prefix@
+exec_prefix = @exec_prefix@
 ROOTDIR = $(prefix)
 EROOTDIR = @exec_prefix@
 abs_top_builddir = @abs_top_builddir@
@@ -16,8 +17,8 @@ abs_top_builddir = @abs_top_builddir@
 srcdir=@srcdir@
 
 BINDIR = $(EROOTDIR)/bin
-LIBDIR=$(EROOTDIR)/lib
-YAPLIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@
+YAPLIBDIR=@libdir@/Yap
 SHAREDIR=$(ROOTDIR)/share/Yap
 
 SHELL=@SHELL@
diff --git a/packages/swi-minisat2/C/Makefile.in b/packages/swi-minisat2/C/Makefile.in
index e1609fcf9..ccf2ba4c0 100644
--- a/packages/swi-minisat2/C/Makefile.in
+++ b/packages/swi-minisat2/C/Makefile.in
@@ -4,6 +4,7 @@
 #
 GCC=@GCC@
 prefix = @prefix@
+exec_prefix = @exec_prefix@
 ROOTDIR = $(prefix)
 EROOTDIR = @exec_prefix@
 abs_top_builddir = @abs_top_builddir@
@@ -14,7 +15,7 @@ BINDIR = $(EROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
diff --git a/packages/swi-minisat2/Makefile.in b/packages/swi-minisat2/Makefile.in
index 8f401300e..f650e16ec 100644
--- a/packages/swi-minisat2/Makefile.in
+++ b/packages/swi-minisat2/Makefile.in
@@ -1,6 +1,7 @@
 #
 # default base directory for YAP installation
 #
+#
 ROOTDIR = @prefix@
 #
 # where the binary should be
@@ -9,7 +10,7 @@ BINDIR = $(ROOTDIR)/bin
 #
 # where YAP should look for binary libraries
 #
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 # where YAP should look for architecture-independent Prolog libraries
 #
diff --git a/pl/arith.yap b/pl/arith.yap
index dfa616909..5defb58ac 100644
--- a/pl/arith.yap
+++ b/pl/arith.yap
@@ -85,7 +85,8 @@ do_not_compile_expressions :- set_value('$c_arith',[]).
 '$do_c_built_in'(X is Y, M, P) :-
         primitive(X), !,
 	'$do_c_built_in'(X =:= Y, M, P).
-'$do_c_built_in'(X is Y, M, (P,A=X)) :- nonvar(X), !,
+'$do_c_built_in'(X is Y, M, (P,A=X)) :-
+	nonvar(X), !,
 	'$do_c_built_in'(A is Y, M, P).
 '$do_c_built_in'(X is Y, _, P) :-
 	nonvar(Y),		% Don't rewrite variables
@@ -163,11 +164,11 @@ do_not_compile_expressions :- set_value('$c_arith',[]).
 '$expand_expr'(A, true, A) :-
 	atomic(A), !.
 '$expand_expr'(T, E, V) :-
-	'$unaryop'(T, O, A), !,
+	T =.. [O, A], !,
 	'$expand_expr'(A, Q, X),
 	'$expand_expr'(O, X, V, Q, E).
 '$expand_expr'(T, E, V) :-
-	'$binaryop'(T, O, A, B), !,
+	T =.. [O, A, B], !,
 	'$expand_expr'(A, Q, X),
 	'$expand_expr'(B, R, Y),
 	'$expand_expr'(O, X, Y, V, Q, S),
@@ -272,65 +273,6 @@ do_not_compile_expressions :- set_value('$c_arith',[]).
 '$preprocess_args_for_non_commutative'(X, Y, Z, W, E) :-
 	'$do_and'(Z = X, Y = W, E).
 	
-
-
-% These are the unary arithmetic operators
-'$unaryop'(+X		,+	,X).
-'$unaryop'(-X		,-	,X).
-'$unaryop'(\(X)		,\	,X).
-'$unaryop'(exp(X)	,exp	,X).
-'$unaryop'(log(X)	,log	,X).
-'$unaryop'(log10(X)	,log10	,X).
-'$unaryop'(sqrt(X)	,sqrt	,X).
-'$unaryop'(sin(X)	,sin	,X).
-'$unaryop'(cos(X)	,cos	,X).
-'$unaryop'(tan(X)	,tan	,X).
-'$unaryop'(asin(X)	,asin	,X).
-'$unaryop'(acos(X)	,acos	,X).
-'$unaryop'(atan(X)	,atan	,X).
-'$unaryop'(atan2(X)	,atan2	,X).
-'$unaryop'(sinh(X)	,sinh	,X).
-'$unaryop'(cosh(X)	,cosh	,X).
-'$unaryop'(tanh(X)	,tanh	,X).
-'$unaryop'(asinh(X)	,asinh	,X).
-'$unaryop'(acosh(X)	,acosh	,X).
-'$unaryop'(atanh(X)	,atanh	,X).
-'$unaryop'(floor(X)	,floor	,X).
-'$unaryop'(abs(X)	,abs	,X).
-'$unaryop'(float(X)	,float	,X).
-'$unaryop'(+(X)		,+	,X).
-'$unaryop'(integer(X)	,integer,X).
-'$unaryop'(truncate(X)	,truncate,X).
-'$unaryop'(round(X)	,round	,X).
-'$unaryop'(ceiling(X)	,ceiling,X).
-'$unaryop'(msb(X)	,msb	,X).
-'$unaryop'(sign(X)	,sign	,X).
-'$unaryop'(float_fractional_part(X)	,float_fractional_part	,X).
-'$unaryop'(float_integer_part(X)	,float_integer_part	,X).
-'$unaryop'(lgamma(X)	,lgamma	,X).
-
-% These are the binary arithmetic operators
-'$binaryop'(X+Y		,+	,X,Y).
-'$binaryop'(X-Y		,-	,X,Y).
-'$binaryop'(X*Y		,*	,X,Y).
-'$binaryop'(X/Y		,/	,X,Y).
-'$binaryop'(X mod Y	,mod	,X,Y).
-'$binaryop'(X rem Y	,rem 	,X,Y).
-'$binaryop'(X//Y	,//	,X,Y).
-'$binaryop'(X/\Y	,/\	,X,Y).
-'$binaryop'(X\/Y	,\/	,X,Y).
-'$binaryop'(X#Y		,'#'	,X,Y).
-'$binaryop'(X<<Y	,<<	,X,Y).
-'$binaryop'(X>>Y	,>>	,X,Y).
-'$binaryop'(X^Y		,^	,X,Y).
-'$binaryop'(X**Y	,**	,X,Y).
-'$binaryop'(exp(X,Y)	,exp	,X,Y).
-'$binaryop'(max(X,Y)	,max	,X,Y).
-'$binaryop'(min(X,Y)	,min	,X,Y).
-'$binaryop'(gcd(X,Y)	,gcd	,X,Y).
-'$binaryop'(atan2(X,Y)	,atan2	,X,Y).
-
-
 /* Arithmetics					*/
 
 % M and N nonnegative integers, N is the successor of M
diff --git a/pl/boot.yap b/pl/boot.yap
index 9765f1c52..2395cd5cd 100755
--- a/pl/boot.yap
+++ b/pl/boot.yap
@@ -56,7 +56,7 @@ true :- true.
 	(
 	 retractall(user:library_directory(_)),
 	 '$system_library_directories'(D),
-	 assert(user:library_directory(D)),
+	 assertz(user:library_directory(D)),
 	 fail
 	;
 	 true
@@ -401,6 +401,8 @@ true :- true.
 	 ( '$notrace'(M:G) -> true ; format(user_error,':- ~w:~w failed.~n',[M,G]) ),
 	 '$enter_system_mode'.
 
+ '$continue_with_command'(Where,V,'$stream_position'(C,_P,A1,A2,A3),'$source_location'(_F,L):G,Source) :- !,
+	  '$continue_with_command'(Where,V,'$stream_position'(C,L,A1,A2,A3),G,Source).
  '$continue_with_command'(reconsult,V,Pos,G,Source) :-
 	 '$go_compile_clause'(G,V,Pos,5,Source),
 	 fail.
diff --git a/pl/consult.yap b/pl/consult.yap
index d83db29b9..acda552b7 100644
--- a/pl/consult.yap
+++ b/pl/consult.yap
@@ -43,7 +43,7 @@ load_files(Files,Opts) :-
 '$check_files'(Files,Call) :-
 	var(Files), !,
 	'$do_error'(instantiation_error,Call).
-'$check_files'(M:Files,Call) :-
+'$check_files'(M:Files,Call) :- !,
 	(var(M)
 	->
 	'$do_error'(instantiation_error,Call)
@@ -878,11 +878,10 @@ absolute_file_name(File,Opts,TrueFileName) :-
 
 '$system_library_directories'(Dir) :-
 	getenv('YAPSHAREDIR', Dir).
-'$system_library_directories'(Dir) :-
-	get_value(system_library_directory,Dir).
-
 '$system_library_directories'(Dir) :-
 	getenv('YAPCOMMONSDIR', Dir).
+'$system_library_directories'(Dir) :-
+	get_value(system_library_directory,Dir).
 '$system_library_directories'(Dir) :-
 	get_value(prolog_commons_directory,Dir).
 
diff --git a/pl/init.yap b/pl/init.yap
index 4c3e0a745..47f5207ae 100644
--- a/pl/init.yap
+++ b/pl/init.yap
@@ -116,7 +116,7 @@ lists:member(X,[_|L]) :-
 
 :-	 ['protect.yap'].
 
-version(yap,[5,1]).
+version(yap,[6,0]).
 
 system_mode(verbose,on)  :- set_value('$verbose',on).
 system_mode(verbose,off) :- set_value('$verbose',off).
diff --git a/pl/protect.yap b/pl/protect.yap
index a1538558b..b847548b5 100644
--- a/pl/protect.yap
+++ b/pl/protect.yap
@@ -39,6 +39,7 @@
 '$hide'('$stream') :- !, fail.			/* not $STREAM */
 '$hide'('$stream_position') :- !, fail.		/* not stream position */
 '$hide'('$hacks') :- !, fail.			
+'$hide'('$source_location') :- !, fail.			
 '$hide'('$messages') :- !, fail.		
 '$hide'(Name) :- hide(Name), fail.
 
diff --git a/shlib b/shlib
deleted file mode 160000
index 9ca7abd12..000000000
--- a/shlib
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9ca7abd128989d971a265c856bea3e1770812664