diff --git a/source/de/anomic/net/natLib.java b/source/de/anomic/net/natLib.java
index d7996220d..38811249d 100644
--- a/source/de/anomic/net/natLib.java
+++ b/source/de/anomic/net/natLib.java
@@ -122,6 +122,7 @@ public class natLib {
 	}
     }
 
+    //TODO: This is not IPv6 compatible
     public static boolean isProper(String ip) {
 	plasmaSwitchboard sb=plasmaSwitchboard.getSwitchboard();
 	String yacyDebugMode = sb.getConfig("yacyDebugMode", "false");
diff --git a/source/de/anomic/tools/bbCode.java b/source/de/anomic/tools/bbCode.java
index 14b4521d8..0341a197e 100644
--- a/source/de/anomic/tools/bbCode.java
+++ b/source/de/anomic/tools/bbCode.java
@@ -73,7 +73,7 @@ public class bbCode {
 	return output;
 	}
 	
-	/**Parses parts of bbCode (to-do: [Img],[URL],[List],[List=]).
+	/**Parses parts of bbCode (TODO: [Img],[URL],[List],[List=]).
 	*@author Alexander Schier
 	*@author Roland Ramthun
 	*@return String
diff --git a/source/de/anomic/tools/enumerateFiles.java b/source/de/anomic/tools/enumerateFiles.java
index 932369e6a..841670fe8 100644
--- a/source/de/anomic/tools/enumerateFiles.java
+++ b/source/de/anomic/tools/enumerateFiles.java
@@ -50,7 +50,7 @@ public class enumerateFiles implements Enumeration {
     // implements iterative search through recursively defined subdirectories
     // and return all paths to the files
     
-    private ArrayList hierarchy; // contains TreeSet elements, earch TreeSet contains File Entries
+    private ArrayList hierarchy; // contains TreeSet elements, each TreeSet contains File Entries
     private boolean incOrder;    // if true, the smallest value is returned first
     private Object buffer;       // the prefetch-buffer
     private boolean return_files;
diff --git a/source/de/anomic/yacy/seedUpload/yacySeedUploadFtp.java b/source/de/anomic/yacy/seedUpload/yacySeedUploadFtp.java
index 1651e2c64..d70fb9264 100644
--- a/source/de/anomic/yacy/seedUpload/yacySeedUploadFtp.java
+++ b/source/de/anomic/yacy/seedUpload/yacySeedUploadFtp.java
@@ -61,7 +61,7 @@ public class yacySeedUploadFtp implements yacySeedUploader {
     
     public String uploadSeedFile (serverSwitch sb, yacySeedDB seedDB, File seedFile) throws Exception {
         try {        
-            if (sb == null) throw new NullPointerException("Reference to serverSwitch nut not be null.");
+            if (sb == null) throw new NullPointerException("Reference to serverSwitch must not be null.");
             if (seedDB == null) throw new NullPointerException("Reference to seedDB must not be null.");
             if ((seedFile == null)||(!seedFile.exists())) throw new Exception("Seed file does not exist.");
             
diff --git a/yacy.nsi b/yacy.nsi
index e9cd61e76..d01627812 100755
--- a/yacy.nsi
+++ b/yacy.nsi
@@ -19,7 +19,7 @@ InstType "Normal"
 InstType "Full"
 
 ; The text to prompt the user to enter a directory
-ComponentText "This will install YaCy v0.40(Build 20050816) on your computer. Select which optional things you want installed."
+ComponentText "This will install YaCy v0.40(Build 20050816) on your computer. Select which optional things you want to be installed."
 ; The text to prompt the user to enter a directory
 #DirText "If an old Version was installed into another locAtion(eg. AnomicHTTPProxy), you have to move the DATA Directory to the new location."
 DirText "Choose a directory to install in to:"