Index: src/common/cmdline_common.ggo
===================================================================
--- src/common/cmdline_common.ggo	(revision 5f4d9c3b32eea7b6643a751aa75bdb05b7d41576)
+++ src/common/cmdline_common.ggo	(revision e0cd003326594ac9d86d8aefddfad61e75644bd1)
@@ -4,7 +4,5 @@
 option  "input"		f	"Input file" string no
 
-option  "output"	o	"Output file for succesfully processed segments" string no
-
-option  "fail"		e	"Output file for unsuccesfully processed segments " string no
+option  "output"	o	"Output file" string no
 
 option 	"only-fail"	-	"Print only segments the program failed to process" flag off hidden
@@ -12,15 +10,15 @@
 option 	"no-fail"	-	"Print only segments the program processed" flag off hidden 
 
-option  "copy"		c       "Copy succesfully processed segments to standard output" flag off
+option  "copy"		c       "Copy succesfully processed segments to output" flag off
 
-option  "process"	p	"Process segments with this tag" string no multiple
+option  "process"	p	"Process segments of this type only" string no multiple
 
-option  "select"	s	"Select only segments with this field" string no multiple
+option  "select"	s	"Select only segments containing this field" string no multiple
 
-option  "ignore"	S	"Select only segments without this field" string no multiple
+option  "ignore"	S	"Select only segments, which doesn't contain this field" string no multiple
 
-option	"output-field"	O	"Output field name" string no
+option	"output-field"	O	"Output field name (default: program name)" string no
 
-option	"input-field"	I	"Input field name" string no multiple
+option	"input-field"	I	"Input field name (default: the FORM field)" string no multiple
 
 option	"interactive"	i	"Toggle interactive mode" flag off
@@ -28,7 +26,7 @@
 option  "config"	-	"Configuration file" string typestr="FILENAME" no
 
-option 	"one-field"	1	"Print all results in one segments (creates ambiguous annotation)" flag off
+option 	"one-field"	1	"Print all alternative results in one field (creates compact ambiguous annotation)" flag off
 
-option	"one-line"	-	"Print annotation alternatives as additional fields" flag off
+option	"one-line"	-	"Print annotation alternatives as additional fields in the same segment" flag off
 
 option	"language"	-	"Language." string no
Index: src/common/common.cc
===================================================================
--- src/common/common.cc	(revision f4bf33ed04eb342d17a377035e58f078b78159c3)
+++ src/common/common.cc	(revision e0cd003326594ac9d86d8aefddfad61e75644bd1)
@@ -10,5 +10,4 @@
 FILE* inputf=stdin;
 FILE* outputf=stdout;
-FILE* failedf=stdout;
 bool copy_processed=0;
 bool one_field=false;
@@ -172,11 +171,4 @@
     }
   
-  if(args->fail_given)
-      if(!(failedf=fopen(args->fail_arg,"w")))
-      {
-	fprintf(stderr,"Cannot open the output file: %s.\n", args->fail_arg);
-	exit(1);
-      }
-
   if(args->input_field_given)
     fieldprefix(args->input_field_arg[0],input_field_prefix);
Index: src/cor/main.cc
===================================================================
--- src/cor/main.cc	(revision 5f4d9c3b32eea7b6643a751aa75bdb05b7d41576)
+++ src/cor/main.cc	(revision e0cd003326594ac9d86d8aefddfad61e75644bd1)
@@ -77,5 +77,5 @@
 	  
 	  if ( tab.count() == 0)
-	    fputs(line, failedf);
+	    fputs(line, outputf);
 	  else 
 	    {
@@ -146,9 +146,5 @@
 	}
       
-      if(args.interactive_flag)
-	{
-        fflush(outputf);
-        fflush(failedf);
-      }
+      if(args.interactive_flag) fflush(outputf);
     }
   cmdline_parser_free(&args);
Index: src/gue/main.cc
===================================================================
--- src/gue/main.cc	(revision 5f4d9c3b32eea7b6643a751aa75bdb05b7d41576)
+++ src/gue/main.cc	(revision e0cd003326594ac9d86d8aefddfad61e75644bd1)
@@ -57,6 +57,6 @@
 	  guess.ana(form, tab);
 	  
-	  if ((tab.count()==0) && (!args.no_fail_flag)) // no guesses - analysis was unsuccessful
-	    fputs(line, failedf);
+	  if ((tab.count()==0)) // no guesses - analysis was unsuccessful
+	    fputs(line, outputf);
 	  else
 	    {
@@ -155,6 +155,5 @@
 	    }
 	}
-      if(args.interactive_flag) 
-	fflush(outputf), fflush(failedf);
+      if(args.interactive_flag) fflush(outputf);
       
     }
Index: src/kor/main.cc
===================================================================
--- src/kor/main.cc	(revision 5f4d9c3b32eea7b6643a751aa75bdb05b7d41576)
+++ src/kor/main.cc	(revision e0cd003326594ac9d86d8aefddfad61e75644bd1)
@@ -22,7 +22,4 @@
 
   Corr cor;
-
-  //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-//  strcpy(dictionary,"cor.bin");
 
   cor.load(dictionary);
@@ -72,5 +69,5 @@
 	  
 	  if ( tab.count() == 0)
-	    fputs(line, failedf);
+	    fputs(line, inputf);
 	  else 
 	    {
@@ -165,9 +162,5 @@
 	}
       
-      if(args.interactive_flag)
-	{
-        fflush(outputf);
-        fflush(failedf);
-      }
+      if(args.interactive_flag) fflush(outputf);
     }
   cmdline_parser_free(&args);
Index: src/lem/common_lem.cc
===================================================================
--- src/lem/common_lem.cc	(revision 5f4d9c3b32eea7b6643a751aa75bdb05b7d41576)
+++ src/lem/common_lem.cc	(revision e0cd003326594ac9d86d8aefddfad61e75644bd1)
@@ -30,22 +30,2 @@
 }
 
-
-// STARE
-//  if(args.dictionary_given)
-//    strcpy(dictionary, args.dictionary_arg);
-//  else {
-//     char path[256];
-//     //sprintf(path, "/etc/utt/data/%s/%s", args.locale_arg, DICT_FILE);
-//     //if (file_accessible(path) == 0)
-//     //  strcpy(dictionary, path);
-//     //else {
-//       sprintf(path, "%s/%s", utt_dir, DICT_FILE);
-//       if (file_accessible(path) == 0)
-// 	strcpy(dictionary, path);
-//       else {
-// 	fprintf(stderr, "Cannot find dictionary!\n");
-// 	exit(1);
-//       }
-//       //}
-//   }
-
Index: src/lem/main.cc
===================================================================
--- src/lem/main.cc	(revision cfdf333a512778a753f04c7ce616075f6059e7bb)
+++ src/lem/main.cc	(revision e0cd003326594ac9d86d8aefddfad61e75644bd1)
@@ -66,5 +66,5 @@
 	  
 	  if (tab.count() == 0) 
-	    fputs(line, failedf);
+	    fputs(line, outputf);
 	  else 
 	    { // mamy jakies opisy w slowniku
@@ -124,6 +124,5 @@
 	}
       
-      if(args.interactive_flag) 
-	fflush(outputf), fflush(failedf);
+      if(args.interactive_flag) fflush(outputf);
       
     }
Index: src/lem_utf8/main.cc
===================================================================
--- src/lem_utf8/main.cc	(revision 5f4d9c3b32eea7b6643a751aa75bdb05b7d41576)
+++ src/lem_utf8/main.cc	(revision e0cd003326594ac9d86d8aefddfad61e75644bd1)
@@ -70,5 +70,5 @@
 	      }
 	      if (tab.count() == 0) {
-	        fputws(line, failedf);
+	        fputws(line, outputf);
        		 }
       
@@ -133,6 +133,5 @@
 	    }
       
-      if (args.interactive_flag) 
-    	  fflush(outputf), fflush(failedf);
+      if (args.interactive_flag) fflush(outputf);
       
     }
Index: src/tok.l/tok_cmdline.ggo
===================================================================
--- src/tok.l/tok_cmdline.ggo	(revision 243d027267a93fc610c5c6b6e29c1a92023e46db)
+++ src/tok.l/tok_cmdline.ggo	(revision e0cd003326594ac9d86d8aefddfad61e75644bd1)
@@ -12,9 +12,9 @@
 
 tok reads from standard input, identifies tokens on the basis of their orthographic form and writes a sequence of segments in UTT format to
-the standard output. The type of the token is printed as the type field.
+the standard output.
 
 OUTPUT FORMAT
 
-UTT-file with four fields: start, length, type, and form. In the type field five types of tokens are distinguished:
+UTT-file with four fields: START, LENGTH, TYPE, and FORM. In the TYPE field five types of tokens are distinguished:
 
   W (word) - continuous sequence of letters