diff --git a/Makefile.in b/Makefile.in
index bf4a4fb1d..af89e6b27 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -420,7 +420,7 @@ doc.h: $(HDR_FILES)
 #
 
 %.gmo:
-	if test $(HAVE_GETTEXT) = 1; then \
+	if test "$(HAVE_GETTEXT)" = 1; then \
 		msgfmt -o $*.gmo $*.po; \
 	fi
 
diff --git a/doc_src/index.hdr.in b/doc_src/index.hdr.in
index 923742997..215f3e80d 100644
--- a/doc_src/index.hdr.in
+++ b/doc_src/index.hdr.in
@@ -1394,7 +1394,6 @@ g++, javac, java, gcj, lpr, doxygen, whois)
 - History could reload itself when the file is updated. This would need to be done in a clever way to avoid chain reactions
 - The error function should probably be moved into it's own library, and be made mere general purpose.
 - The code validation functions should be moved from the parser to parse_util.
-- The parser_is_* functions should be moved to parse_util. Possibly, they should be made into a single function, i.e. parse_util_classify( "begin", BLOCK_COMMAND);
 - Try to remove more malloc calls to reduce memory usage. The time_t arrays used by the autoloader sound like a good candidate. 
 - The code validator should warn about unknown commands.
 - Auto-newlines
diff --git a/fish_indent.c b/fish_indent.c
index 7fcfb6b77..35bd24e45 100644
--- a/fish_indent.c
+++ b/fish_indent.c
@@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
 /** \file main.c
-	The main loop of <tt>fish</tt>.
+	The fish_indent proegram.
 */
 
 #include "config.h"
@@ -26,22 +26,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <stdio.h>
 #include <wchar.h>
 #include <string.h>
-#include <unistd.h>
 #include <errno.h>
 #include <unistd.h>
-#include <termios.h>
-#include <fcntl.h>
-
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #endif
-
 #include <locale.h>
-#include <signal.h>
 
 #include "fallback.h"
 #include "util.h"
-
 #include "common.h"
 #include "wutil.h"
 #include "halloc.h"
diff --git a/parser.c b/parser.c
index bec353837..0832939ac 100644
--- a/parser.c
+++ b/parser.c
@@ -2059,7 +2059,8 @@ static int parse_job( process_t *p,
 						{			
 							debug( 0,
 								   _(L"Unknown command '%ls'"),
-								   cmd );
+								   cmd?cmd:L"UNKNOWN" );
+
 						}
 						
 						tmp = current_tokenizer_pos;
diff --git a/parser_keywords.c b/parser_keywords.c
index 37b3dcd85..b9df0edfc 100644
--- a/parser_keywords.c
+++ b/parser_keywords.c
@@ -1,6 +1,6 @@
 /** \file parser_keywords.c
 
-
+Functions having to do with parser keywords, like testing if a function is a block command.
 */
 
 #include "config.h"
@@ -10,9 +10,6 @@
 #include <stdio.h>
 
 #include "fallback.h"
-//#include "util.h"
-
-//#include "wutil.h"
 #include "common.h"
 #include "parser_keywords.h"
 
diff --git a/reader.c b/reader.c
index 3bd965506..e8a743893 100644
--- a/reader.c
+++ b/reader.c
@@ -2962,16 +2962,18 @@ static int read_ni( int fd, io_data_t *io )
 			int c;
 
 			c = fread(buff, 1, 4096, in_stream);
-			if( ferror( in_stream ) )
+			
+			if( ferror( in_stream ) && ( errno != EINTR ) )
 			{
 				debug( 1,
-					   _( L"Error while reading commands" ) );
-
+					   _( L"Error while reading from file descriptor" ) );
+				
 				/*
 				  Reset buffer on error. We won't evaluate incomplete files.
 				*/
 				acc.used=0;
 				break;
+				
 			}
 
 			b_append( &acc, buff, c );
diff --git a/tokenizer.c b/tokenizer.c
index 1fe002db2..c7fd20c96 100644
--- a/tokenizer.c
+++ b/tokenizer.c
@@ -22,7 +22,6 @@ segments.
 #include "wutil.h"
 #include "tokenizer.h"
 #include "common.h"
-#include "wildcard.h"
 
 
 /**