diff --git a/doc_src/index.hdr b/doc_src/index.hdr
index c30c73b3e..1d591eb67 100644
--- a/doc_src/index.hdr
+++ b/doc_src/index.hdr
@@ -1325,8 +1325,6 @@ g++, javac, java, gcj, lpr, doxygen, whois, find)
 - Reduce the space of the pager by one line to allow the commandline to remain visible.
 - down-arrow could be used to save the current command to the history. Or give the next command in-sequnce. Or both.
 - A pretty-printer.
-- Help messages for builtin should  not be compiled into fish, they should be kept in a separate directory
-- Shellscript functions should be able to show help on the commandline instead of launching a browser
 - Drop support for inputrc-files. Use shellscripts and the bind builtin. Also, redo the syntax for the bind builtin to something more sane.
 - 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.
diff --git a/env_universal.h b/env_universal.h
index 3eb101ed7..bd76491d9 100644
--- a/env_universal.h
+++ b/env_universal.h
@@ -1,5 +1,5 @@
 /** \file env_universal.h
-	Universal variable client library
+	Universal variable client library.
 */
 
 #ifndef ENV_UNIVERSAL_H
diff --git a/parser.c b/parser.c
index 475e8d2dd..a8d076306 100644
--- a/parser.c
+++ b/parser.c
@@ -1,6 +1,6 @@
 /** \file parser.c
 
-The fish parser. Contains functions for parsing code.
+The fish parser. Contains functions for parsing and evaluating code.
 
 */
 
diff --git a/proc.c b/proc.c
index a4644d764..af191460c 100644
--- a/proc.c
+++ b/proc.c
@@ -879,7 +879,7 @@ static int terminal_give_to_job( job_t *j, int cont )
 }
 
 /**
-   REturns contol of the terminal 
+   Returns contol of the terminal to the shell
 */
 static int terminal_return_from_job( job_t *j)
 {
diff --git a/reader.c b/reader.c
index 5730606ba..c9663f156 100644
--- a/reader.c
+++ b/reader.c
@@ -1368,7 +1368,7 @@ static void handle_token_history( int forward, int reset )
 	{
 		if( current_pos == -1 )
 		{
-			wchar_t *item;
+			const wchar_t *item;
 			
 			/*
 			  Move to previous line