diff --git a/addon/yacyInit.sh b/addon/yacyInit.sh
index 189757239..c27f1c98c 100755
--- a/addon/yacyInit.sh
+++ b/addon/yacyInit.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# init script for the HTTP Proxy: yacy
+# init script for the HTTP Proxy: YaCy
 #
 # Provided by Matthias Kempka, 26.12.2004
 
@@ -12,7 +12,7 @@ USER=yacy #set to the user whose rights the proxy will gain
 CLASSPATH=$DAEMON_DIR/classes
 DAEMON=$DAEMON_DIR/startYACY.sh
 NAME="yacy"
-DESC="Yacy HTTP Proxy"
+DESC="YaCy HTTP Proxy"
 PID_FILE=/var/run/$NAME.pid
 
 # Don't run if not installed
diff --git a/doc/News.html b/doc/News.html
index 626c3433c..a0a1d49f0 100644
--- a/doc/News.html
+++ b/doc/News.html
@@ -237,7 +237,7 @@ globalheader();
 <li>Sorted config list in Config_p.html and sorted file list in Cache Admin menu</li>
 <li>Code clean-up: added finals and constants</li>
 <li>New Network menu design; showing peer status, Index Receive and Crawl Receive properties as images</li>
-<li>Added ICAP support; now an experimental ICAP Server is embedded and Yacy allows other proxies to use the indexing service via icap response modification requests</li>
+<li>Added ICAP support; now an experimental ICAP Server is embedded and YaCy allows other proxies to use the indexing service via icap response modification requests</li>
 <li>Single-Peer permanent index transfer (full flush to other peer)</li>
 <li>Added a templateCache to httpFileHandler</li>
 <li>Added blacklist support for https requests and crawler</li>
diff --git a/locales/de.lng b/locales/de.lng
index 1daa94a3c..e81134171 100644
--- a/locales/de.lng
+++ b/locales/de.lng
@@ -1186,7 +1186,7 @@ A prefetch of 0 means no prefetch; a prefetch of 1 means to prefetch all==Bei ei
 embedded URLs, but since embedded image links are loaded by the browser==die auf dieser Seite verlinkt sind, geladen und indexiert werden; Da Links auf Bilder sowieso schon vom Browser geladen werden,
 this means that only embedded href-anchors are prefetched additionally.==trifft dies nur auf eingebettet HREF-Anker zu.
 Store to Cache==Speicher im Cache
-It is almost always recommended to set this on. The only exception is that you have another caching proxy running as secondary proxy and YaCy is configured to used that proxy in proxy-proxy - mode.==Es wird empfohlen diese Option immer zu aktivieren. Einzige Ausnahme: Sie haben einen zweiten Proxy als Cache laufen und Yacy soll im "Proxy-zu-Proxy"-Modus laufen.
+It is almost always recommended to set this on. The only exception is that you have another caching proxy running as secondary proxy and YaCy is configured to used that proxy in proxy-proxy - mode.==Es wird empfohlen diese Option immer zu aktivieren. Einzige Ausnahme: Sie haben einen zweiten Proxy als Cache laufen und YaCy soll im "Proxy-zu-Proxy"-Modus laufen.
 Do Remote Indexing==Remote Indexierung
 If checked, the crawler will contact other peers and use them as remote indexers for your crawl.==Wenn aktiviert, wird der Crawler andere Peers anfragen und als remote Indexierer f&uuml;r Ihren Crawl nutzen.
 If you need your crawling results locally, you should switch this off.==Sollten Sie Ihre Crawling Ergebnisse lokal ben&ouml;tigen, dann deaktivieren Sie diese Funktion.
@@ -1581,7 +1581,7 @@ Enabled: Updating periodically to file==Aktiv: Periodisches Update in Datei
 Last upload:==Letzter Upload:
 Online-mode==Onlinemodus
 You are in <i>Cache-browsing</i> mode.==Sie sind im <i>Cache</i> Modus.
-Only Website from the Proxycache are accessable.==Nur Webseiten aus dem Proxycache sind aufrufbar.
+Only Website from the Proxycache are accessable.==Nur Webseiten aus dem Proxycache sind abrufbar.
 To switch online-mode, press one of the following buttons:==Um den Online Modus zu wechseln, klicken Sie auf einen der folgenden Buttons:
 "event-based Mode"=="aktivit&auml;tsbasierten Modus"
 "Permanent Mode"=="Permanenter Modus"
diff --git a/source/de/anomic/soap/build.xml b/source/de/anomic/soap/build.xml
index 219691056..108f6d846 100644
--- a/source/de/anomic/soap/build.xml
+++ b/source/de/anomic/soap/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <project name="YACY - SOAP API" default="dist">
     <description>
-            A SOAP API for Yacy
+            A SOAP API for YaCy
     </description>
 
     <property name="addonShortName" value="Soap"/>
diff --git a/yacy.init b/yacy.init
index 84b6febec..006c64cc4 100644
--- a/yacy.init
+++ b/yacy.init
@@ -16,12 +16,17 @@
 port = 8080
 
 # SSL support:
+#
+# For a German manual see http://yacy-websuche.de/wiki/index.php/De:Interface%C3%9CberHTTPS
+#
+# English speaking user read below:
+#
 # With this you can access your peer using https://localhost:8080
 # 
 # There are two possibilities to specify which certificate should
 # be used by YaCy.
 #
-# 1) Create a new Certificate:
+# 1) Create a new certificate:
 #
 #    *) For testing purposes, you can create a keystore with a self-signed certificate, 
 #       using the following command:
@@ -42,7 +47,7 @@ port = 8080
 #
 #    If the property keyStore is not specified, then a new keystore file 
 #    DATA/SETTINGS/myPeerKeystore will be created.
-#
+
 keyStore =
 keyStorePassword =
 pkcs12ImportFile = 
@@ -130,11 +135,9 @@ htLocaleSelection=default
 fileHost = localpeer
 
 # root path for message files
-messPath = C:/AnomicServer
-
-# specify the path to the MIME matching file table
-mimeConfig = httpd.mime
+# messPath = C:/AnomicServer
 
+# UNUSED:
 # specify the path to message resource file
 messConfig = httpd.messages
 
@@ -293,7 +296,7 @@ adminAccountBase64MD5=
 # - File
 # - Scp (only if you have installed the optional addon)
 #
-seedUploadMethod=
+seedUploadMethod=none
 
 # The URL to the seed list file 
 seedURL=
@@ -690,7 +693,7 @@ CRDist1Method  = 9
 CRDist1Percent = 30
 CRDist1Target  = kaskelix.de:8080,yacy.dyndns.org:8000,suma-lab.de:8080
 
-#
+# Hash of the peer, you would like to store to the data your installation collected.
 storagePeerHash =
 
 # Search sequence settings