diff --git a/bigchaindb/config_utils.py b/bigchaindb/config_utils.py
index 26afa3c8..645780eb 100644
--- a/bigchaindb/config_utils.py
+++ b/bigchaindb/config_utils.py
@@ -117,7 +117,7 @@ def load_consensus_plugin(name=None):
     if not name:
         name = bigchaindb.config.get('consensus_plugin', 'default')
 
-    # TODO: This will return the first plugin with group `bigchaindb.plugins`
+    # TODO: This will return the first plugin with group `bigchaindb.consensus`
     #       and name `name` in the active WorkingSet.
     #       We should probably support Requirements specs in the config, e.g.
     #       consensus_plugin: 'my-plugin-package==0.0.1;default'
@@ -128,7 +128,7 @@ def load_consensus_plugin(name=None):
     # No matching entry_point found
     if not plugin:
         raise ResolutionError(
-            'No plugin found in group `bigchaindb.plugins` with name `{}`'.
+            'No plugin found in group `bigchaindb.consensus` with name `{}`'.
             format(name))
 
     # Is this strictness desireable?
diff --git a/bigchaindb/consensus.py b/bigchaindb/consensus.py
index 818249b8..b65ab9ad 100644
--- a/bigchaindb/consensus.py
+++ b/bigchaindb/consensus.py
@@ -41,7 +41,7 @@ class AbstractConsensusRules(metaclass=ABCMeta):
             block (dict): block to validate.
 
         Returns:
-            The block if the block is valid else it raises and exception
+            The block if the block is valid else it raises an exception
             describing the reason why the block is invalid.
 
         Raises:
@@ -177,7 +177,7 @@ class BaseConsensusRules(AbstractConsensusRules):
             block (dict): block to validate.
 
         Returns:
-            The block if the block is valid else it raises and exception
+            The block if the block is valid else it raises an exception
             describing the reason why the block is invalid.
 
         Raises:
diff --git a/docs/source/introduction.md b/docs/source/introduction.md
index 4583d941..3c1230ad 100644
--- a/docs/source/introduction.md
+++ b/docs/source/introduction.md
@@ -1,10 +1,10 @@
 # Introduction
 
-BigchainDB is a scalable blockchain database. You can read about its motivations, goals and high-level architecture in the [BigchainDB whitepaper](https://www.bigchaindb.com/whitepaper/). This document, the _BigchainDB Documentation_, is intended primarily for three groups of people:
+BigchainDB is a scalable blockchain database. You can read about its motivations, goals and high-level architecture in the [BigchainDB whitepaper](https://www.bigchaindb.com/whitepaper/). This document, the _BigchainDB Documentation_, is intended primarily for:
 
 1. Developers of BigchainDB server software.
 2. People deploying and managing BigchainDB clusters.
 3. Developers of BigchainDB driver software (SDKs used to develop client software).
 4. App developers who are developing client apps to talk to one or more live, operational BigchainDB clusters. They would use one of the BigchainDB drivers.
 
-If you're curious about what's coming in our roadmap, see [the ROADMAP.md file](https://github.com/bigchaindb/bigchaindb/blob/develop/ROADMAP.md) and [the list of open issues](https://github.com/bigchaindb/bigchaindb/issues). If you want to request a feature, file a bug report, or make a pull request, see [the CONTRIBUTING.md file](https://github.com/bigchaindb/bigchaindb/blob/develop/CONTRIBUTING.md).
+If you're curious about what's in our roadmap, see [the ROADMAP.md file](https://github.com/bigchaindb/bigchaindb/blob/develop/ROADMAP.md) and [the list of open issues](https://github.com/bigchaindb/bigchaindb/issues). If you want to request a feature, file a bug report, or make a pull request, see [the CONTRIBUTING.md file](https://github.com/bigchaindb/bigchaindb/blob/develop/CONTRIBUTING.md).