diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c1ade7f2970596a6570c05ac52ae522064d6035..d3313d3d7b2a74e779b82a0d30e14849f752180c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 2.8.7)
 project(macaon2)
 
 find_package(FLEX)
+find_package(BLAS)
 
 add_definitions("-Wall" )
 SET(CMAKE_C_COMPILER g++)
diff --git a/README b/README
index bef7b3e835a5c4c5aa8420ff771f5b58cb7bd2c0..a1dae6bb7b0466270821ef9a97a65e23281b7d48 100644
--- a/README
+++ b/README
@@ -1 +1,7 @@
+if you want to use a debugger
+
 cmake -DCMAKE_BUILD_TYPE=Debug ..
+
+if you want the binaries to be installed in a special directory
+
+cmake -DCMAKE_INSTALL_PREFIX:PATH=absolute_path_to_directory_where_binaries_will_be_copied ..
\ No newline at end of file
diff --git a/maca_tokenizer/src/fr_tok_rules.l b/maca_tokenizer/src/fr_tok_rules.l
index d0f391d2994acf6a9260da5047fd6d576f6cd241..59b1909acc4c347676e79d025d2efb993d1c6af3 100644
--- a/maca_tokenizer/src/fr_tok_rules.l
+++ b/maca_tokenizer/src/fr_tok_rules.l
@@ -13,7 +13,7 @@ extern int defait_amalgames;
 	BEGIN(state_defait_amalgames);
 	}
 
-[0-9]+,[0-9]* printf("%s", yytext);
+[0-9]+,[0-9]+ printf("%s", yytext);
 [ \t]+   printf("\n");
 [ ]*\.       printf("\n.");
 [ ]*\?       printf("\n?");
diff --git a/maca_trans_parser/CMakeLists.txt b/maca_trans_parser/CMakeLists.txt
index be494e50df9fd828c3b9040d4816077bc9e3d343..409b89371366e720c8702aaa01f385521171d7da 100644
--- a/maca_trans_parser/CMakeLists.txt
+++ b/maca_trans_parser/CMakeLists.txt
@@ -4,7 +4,7 @@ set(SOURCES src/context.c
   src/movement_tagparser_arc_eager.c
   src/movement_tagger.c
   src/feat_fct.c
-  src/global_feat_vec.c
+#  src/global_feat_vec.c
   # src/oracle_parser.c
   src/oracle_parser_arc_eager.c
   src/oracle_tagparser_arc_eager.c
@@ -32,11 +32,11 @@ add_library(transparse STATIC ${SOURCES})
 target_link_libraries(transparse perceptron)
 
 #compiling, linking and installing executables
-add_executable(maca_trans_parser_nn ./src/maca_trans_parser_nn.cc)
-target_link_libraries(maca_trans_parser_nn perceptron)
-target_link_libraries(maca_trans_parser_nn transparse)
-target_link_libraries(maca_trans_parser_nn maca_common)
-install (TARGETS maca_trans_parser_nn DESTINATION bin)
+#add_executable(maca_trans_parser_nn ./src/maca_trans_parser_nn.cc)
+#target_link_libraries(maca_trans_parser_nn perceptron)
+#target_link_libraries(maca_trans_parser_nn transparse)
+#target_link_libraries(maca_trans_parser_nn maca_common)
+#install (TARGETS maca_trans_parser_nn DESTINATION bin)
 
 add_executable(maca_trans_tagger_mcf2cff ./src/maca_trans_tagger_mcf2cff.c)
 target_link_libraries(maca_trans_tagger_mcf2cff perceptron)
diff --git a/maca_trans_parser/src/simple_decoder_parser_arc_eager.c b/maca_trans_parser/src/simple_decoder_parser_arc_eager.c
index 7c44a6b32fe89378c75722a610cbdece3a1905ba..9cb7a91cd87b2ea7926a7240981449110f882840 100644
--- a/maca_trans_parser/src/simple_decoder_parser_arc_eager.c
+++ b/maca_trans_parser/src/simple_decoder_parser_arc_eager.c
@@ -186,7 +186,17 @@ void simple_decoder_parser_arc_eager(context *ctx)
 
       mvt_type = movement_parser_type(mvt_code);
       mvt_label = movement_parser_label(mvt_code);
-            
+
+      if((mvt_type == MVT_PARSER_EOS) && (word_get_sent_seg(stack_top(config_get_stack(c))) == 0)){
+	if(ctx->verbose)
+	  fprintf(stderr, "the classifier did predict EOS but this is not the case\n");
+	feature_table_argmax_1_2(fv, ft, &argmax1, &max1, &argmax2, &max2);
+	mvt_code = argmax2;
+	mvt_type = movement_parser_type(mvt_code);
+	mvt_label = movement_parser_label(mvt_code);
+	
+      }
+      
       result = 0;
       switch(mvt_type){
       case MVT_PARSER_LEFT :