diff --git a/doc/source/description.rst b/doc/source/description.rst
index b7dd099..47887ae 100644
--- a/doc/source/description.rst
+++ b/doc/source/description.rst
@@ -41,14 +41,14 @@ Known Limitations
 -----------------
 
 * The plugin has some limitations regarding node count scalability for NSDB
-  (Network State Database) and OpenStack Controller role nodes. Once number of
-  nodes with such roles have been determined on initial deployment, it can not
-  be changed. Compute role nodes are not affected by this limitation, current
-  plugin version supports Compute scalability.
+  (Network State Database) nodes. Once number of nodes with such role have been
+  determined on initial deployment, it can not be changed. Controller and
+  Compute role nodes are not affected by this limitation, current plugin
+  version supports Controller and Compute scalability.
 
 * Current version of plugin can only deploy single MidoNet Gareway role node.
   MidoNet itself supports any number of gateway nodes, it is only a plugin
-  limitation, additional nodes needs to be set up manually. 
+  limitation, additional gateways needs to be set up manually. 
 
 .. _v2015.06: https://github.com/midonet/midonet/releases/tag/v2015.06.3
 .. _MEM: http://docs.midokura.com/docs/latest/manager-guide/content/index.html
diff --git a/doc/source/guide.rst b/doc/source/guide.rst
index 80e3a15..4d74ea6 100644
--- a/doc/source/guide.rst
+++ b/doc/source/guide.rst
@@ -114,8 +114,10 @@ Select Environment
    .. image:: ../images/tunneling.png
       :width: 75%
 
-   After that, you will be able to choose between *GRE* or *VXLAN* segmentation.
-   MidoNet works with both.
+   After that, one will be able to choose between *GRE* or *VXLAN* encapsulation
+   (WEB interface; Settings, Other section). MidoNet works with both of the
+   encapsulation technologies, but VXLAN may offer better performance,
+   especially for the deployments of a larger scale.
 
 #. MidoNet plugin does not interact with the rest of the options, so choose
    whatever your deployment demands on them. Follow instructions from the
diff --git a/doc/source/installation.rst b/doc/source/installation.rst
index 8f74132..c8c3db6 100644
--- a/doc/source/installation.rst
+++ b/doc/source/installation.rst
@@ -30,4 +30,4 @@ To install the MidoNet Fuel plugin:
     9  | midonet | 4.0.0   | 4.0.0
 
 .. _`Fuel Plugin Catalog`: https://www.mirantis.com/products/openstack-drivers-and-plugins/fuel-plugins/
-.. _`Fuel CLI`: https://docs.mirantis.com/openstack/fuel/fuel-8.0/user-guide.html#using-fuel-cli
+.. _`Fuel CLI`: http://docs.openstack.org/developer/fuel-docs/userdocs/fuel-user-guide/cli.html