diff --git a/C/c_interface.c b/C/c_interface.c
index 8243b9c57..4f92cb40e 100644
--- a/C/c_interface.c
+++ b/C/c_interface.c
@@ -10,8 +10,13 @@
 * File:		c_interface.c						 *
 * comments:	c_interface primitives definition 			 *
 *									 *
-* Last rev:	$Date: 2007-10-28 00:54:09 $,$Author: vsc $						 *
+* Last rev:	$Date: 2007-10-29 22:48:54 $,$Author: vsc $						 *
 * $Log: not supported by cvs2svn $
+* Revision 1.100  2007/10/28 00:54:09  vsc
+* new version of viterbi implementation
+* fix all:atvars reporting bad info
+* fix bad S info in x86_64
+*
 * Revision 1.99  2007/10/16 18:57:17  vsc
 * get rid of debug statement.
 *
@@ -1601,7 +1606,7 @@ YAP_Init(YAP_init_args *yap_init)
 
   Yap_argv = yap_init->Argv;
   Yap_argc = yap_init->Argc;
-  if (yap_init->SavedState != NULL ||
+  if (yap_init->SavedState != NULL &&
       yap_init->YapPrologBootFile == NULL) {
     if (Yap_SavedInfo (yap_init->SavedState, yap_init->YapLibDir, &Trail, &Stack, &Heap) != 1) {
       yap_init->ErrorNo = Yap_Error_TYPE;
diff --git a/C/cdmgr.c b/C/cdmgr.c
index 214f65235..34fb55b3b 100644
--- a/C/cdmgr.c
+++ b/C/cdmgr.c
@@ -11,8 +11,11 @@
 * File:		cdmgr.c							 *
 * comments:	Code manager						 *
 *									 *
-* Last rev:     $Date: 2007-04-10 22:13:20 $,$Author: vsc $						 *
+* Last rev:     $Date: 2007-10-29 22:48:54 $,$Author: vsc $						 *
 * $Log: not supported by cvs2svn $
+* Revision 1.206  2007/04/10 22:13:20  vsc
+* fix max modules limitation
+*
 * Revision 1.205  2007/03/26 15:18:43  vsc
 * debugging and clause/3 over tabled predicates would kill YAP.
 *
@@ -2201,9 +2204,9 @@ p_in_this_f_before(void)
     if (fp->p == p0)
       break;
   if (fp != ConsultBase)
-    return (TRUE);
+    return TRUE;
   else
-    return (FALSE);
+    return FALSE;
 }
 
 static Int 
diff --git a/C/corout.c b/C/corout.c
index 33ab4e1a3..67f36c398 100644
--- a/C/corout.c
+++ b/C/corout.c
@@ -503,8 +503,6 @@ non_ground(Term t, Term *Var)
       if (out >= 0)
 	return out;
     }
-    extern int Yap_do_low_level_trace;
-    Yap_do_low_level_trace=1;
     if (!Yap_ExpandPreAllocCodeSpace(0, NULL)) {
       Yap_Error(OUT_OF_AUXSPACE_ERROR, ARG1, "overflow in ground");
       return FALSE;
diff --git a/C/save.c b/C/save.c
index 92718a4c5..ae724dfa6 100644
--- a/C/save.c
+++ b/C/save.c
@@ -1428,7 +1428,7 @@ OpenRestore(char *inpf, char *YapLibDir, CELL *Astate, CELL *ATrail, CELL *AStac
 {
   int mode = FAIL_RESTORE;
 
-  Yap_ErrorMessage = NULL;
+  //  Yap_ErrorMessage = NULL;
   if (inpf == NULL)
     inpf = StartUpFile;
 #if __simplescalar__
diff --git a/pl/boot.yap b/pl/boot.yap
index fbd246a5c..4fc7fcaa7 100644
--- a/pl/boot.yap
+++ b/pl/boot.yap
@@ -852,6 +852,7 @@ break :-
 
 '$silent_bootstrap'(F) :-
 	'$allocate_default_arena'(1024, 64),
+	nb_setval('$if_level',0),
 	get_value('$lf_verbose',OldSilent),
 	set_value('$lf_verbose',silent),
 	bootstrap(F),
diff --git a/pl/init.yap b/pl/init.yap
index 25def2b33..cc48c9c4a 100644
--- a/pl/init.yap
+++ b/pl/init.yap
@@ -43,7 +43,6 @@ otherwise.
 :- bootstrap('consult.yap').
 
 
-
 :- [	 'utils.yap',
 	 'arith.yap',
 	 'directives.yap'].
@@ -150,3 +149,4 @@ file_search_path(system, Dir) :-
 	prolog_flag(host_type, Dir).
 file_search_path(foreign, yap('lib/Yap')).
 
+:- start_low_level_trace.