diff --git a/templates/doc/annotation.html.ep b/templates/doc/annotation.html.ep
index 18cdad9..7c839c0 100644
--- a/templates/doc/annotation.html.ep
+++ b/templates/doc/annotation.html.ep
@@ -2,7 +2,7 @@
 
 %= page_title
 
-<p>KorAP supports an arbitrary number of <%= embedded_link_to 'doc', 'Annotations', 'data', 'annotation' %> from different sources (called <em>foundries</em>) with different <em>layers</em>.</p>
+<p>KorAP also supports an arbitrary number of <%= embedded_link_to 'doc', 'annotations', 'data', 'annotation' %> from different sources (called <em>foundries</em>) with different <em>layers</em>.</p>
 
 <dl>
   <p>Annotations of the following kind are supported:</p>
diff --git a/templates/doc/api.html.ep b/templates/doc/api.html.ep
index 411a876..1be1fe1 100644
--- a/templates/doc/api.html.ep
+++ b/templates/doc/api.html.ep
@@ -4,7 +4,7 @@
 
 <p>Internally the communication between KorAP components is done using the KoralQuery protocol.
   The specification for KoralQuery is available on <%= ext_link_to 'GitHub', "http://korap.github.io/Koral" %>.
-  All API endpoints either use KoralQuery or are (more or lest) REST-ful web APIs.</p>
+  All API endpoints either use KoralQuery or are (more or less) REST-ful web APIs.</p>
 
 <p>All publicly available API endpoints (partially experimental) including their requests and responses are described in the <%= ext_link_to 'GitHub Wiki', "https://github.com/KorAP/Kustvakt/wiki" %> of <%= embedded_link_to 'doc', 'Kustvakt', 'korap', 'kustvakt' %>.</p>
 
diff --git a/templates/doc/development.html.ep b/templates/doc/development.html.ep
index 1a041dd..69788c2 100644
--- a/templates/doc/development.html.ep
+++ b/templates/doc/development.html.ep
@@ -4,7 +4,7 @@
 
 %= korap_overview 'development'
 
-<p>The KorAP project was launched in 2011 at the <%= ext_link_to 'Leibniz Institute for the German Language (IDS)', "https://www.ids-mannheim.de/" %> in Mannheim, Germany. KorAP is a Corpus Analysis Platform, with an extensible and scalable architecture. It consists of multiple components, that are exchangable due to well defined APIs.</p>
+<p>The KorAP project was launched in 2011 at the <%= ext_link_to 'Leibniz Institute for the German Language (IDS)', "https://www.ids-mannheim.de/" %> in Mannheim, Germany. KorAP is a corpus analysis platform with an extensible and scalable architecture. It consists of multiple components that are exchangable due to well defined APIs.</p>
 
 <dl>
   <dt><%= embedded_link_to('doc', 'Kalamar', 'development', 'kalamar') %></dt>
@@ -14,16 +14,16 @@
   <dd>As an alternative to the user frontend, queries can be initiated using a REST web interface directly with Kustvakt.</dd>
 
   <dt><%= embedded_link_to('doc', 'Kustvakt', 'development', 'kustvakt') %></dt>
-  <dd>Kustvakt is the central user and policy management service. It takes a query and rewrites it to restrict the scope of a search to documents the user is allowed to. It may also inject further properties the user has set up, like preferred annotation layers. To transfer a query written in a certain query language to the internal general query protocol <%= embedded_link_to('doc', 'KoralQuery', 'api', 'koralquery') %>, Kustvakt uses <%= embedded_link_to('doc', 'Koral', 'development', 'koral') %>.</dd>
+  <dd>Kustvakt is the central user and policy management service. It takes a query and rewrites it to restrict the scope of a search to documents the user is allowed to access. It may also inject further properties the user has set up, like preferred annotation layers. To transfer a query written in a certain query language to the internal general query protocol <%= ext_link_to 'KoralQuery', "https://korap.github.io/Koral/" %>, Kustvakt uses <%= embedded_link_to('doc', 'Koral', 'development', 'koral') %>.</dd>
 
   <dt><%= embedded_link_to('doc', 'Koral', 'development', 'koral') %></dt>
-  <dd>Koral is a library that translates queries written in one of several implemented query languages into a general query protocol, called <%= embedded_link_to('doc', 'KoralQuery', 'api', 'koralquery') %>.</dd>
+  <dd>Koral is a library that translates queries written in one of several implemented query languages into a general query protocol, called <%= ext_link_to 'KoralQuery', "https://korap.github.io/Koral/" %>.</dd>
 
   <dt><%= embedded_link_to('doc', 'Krill', 'development', 'krill') %></dt>
-  <dd>Krill is a Lucene based backend engine that can search large corpora for occurrences of search patterns formulated in <%= embedded_link_to('doc', 'KoralQuery', 'api', 'koralquery') %>.</dd>
+  <dd>Krill is a Lucene-based backend engine that can search large corpora for occurrences of search patterns formulated in <%= ext_link_to 'KoralQuery', "https://korap.github.io/Koral/" %>.</dd>
 
   <dt><%= embedded_link_to('doc', 'Karang', 'development', 'karang') %></dt>
-  <dd>Karang is a Neo4j based backend engine that can traverse large corpora represented as graphs.</dd>
+  <dd>Karang is a Neo4j-based backend engine that can traverse large corpora represented as graphs.</dd>
 </dl>
 
 <h3>Team</h3>
diff --git a/templates/doc/faq.html.ep b/templates/doc/faq.html.ep
index 648402e..f5fce71 100644
--- a/templates/doc/faq.html.ep
+++ b/templates/doc/faq.html.ep
@@ -16,7 +16,7 @@
 
 <section>
   <h3>I want to report an issue, how do I do it?</h3>
-  <p>Please refer to our public ticketing system <%= ext_link_to 'for the frontend at GitHub', 'https://github.com/KorAP/Kalamar/issues' %>, to report on any issues. If you don't have a GitHub account, please send us an <%= mail_to_chiffre join('@', 'korap', 'ids-mannheim.de'), subject => 'I found an issue', begin %>e-mail<% end %>.</p>
+  <p>Please refer to our public ticketing system <%= ext_link_to 'for the frontend at GitHub', 'https://github.com/KorAP/Kalamar/issues' %> to report on any issues. If you don't have a GitHub account, please send us an <%= mail_to_chiffre join('@', 'korap', 'ids-mannheim.de'), subject => 'I found an issue', begin %>e-mail<% end %>.</p>
   %# This option is the preferred one because it gathers some (and will in time gather more) important versioning data.
 </section>