diff --git a/content/concepts/components.md b/content/concepts/components.md
index 70ae2d43..0294dbb3 100644
--- a/content/concepts/components.md
+++ b/content/concepts/components.md
@@ -7,10 +7,18 @@ Before reading this page, you should understand some [Ocean-specific terminology
 
 ## Aquarius
 
-Marketplaces run Aquarius to store and manage metadata about the [assets](/concepts/terminology/#asset-or-data-asset) available in their marketplace. It provides an HTTP API for interacting with an off-chain database ([OceanDB](/concepts/components/#oceandb-drivers)).
+Marketplaces run Aquarius to store and manage metadata about the [assets](/concepts/terminology/#asset-or-data-asset) available in their marketplace. It provides an HTTP API for interacting with an off-chain database (sometimes called "OceanDB").
 
 <repo name="aquarius"></repo>
 
+### OceanDB Drivers
+
+Aquarius supports several options for the off-chain database (OceanDB), including MongoDB, Elasticsearch and BigchainDB. One can add support for another off-chain database by creating a new driver similar to the existing OceanDB drivers.
+
+<repo name="oceandb-mongodb-driver"></repo>
+<repo name="oceandb-bigchaindb-driver"></repo>
+<repo name="oceandb-elasticsearch-driver"></repo>
+
 ## Brizo
 
 Publishers run Brizo to manage interactions with marketplaces and consumers.
@@ -19,6 +27,14 @@ The most basic scenario for a publisher is to provide access to the [assets](/co
 
 <repo name="brizo"></repo>
 
+### Osmosis Drivers
+
+Brizo supports several options for file storage, including Azure Storage, Amazon S3 and on-premise storage. One can add support for another file storage option by creating a new driver similar to one of the existing Osmosis drivers.
+
+<repo name="osmosis-azure-driver"></repo>
+<repo name="osmosis-aws-driver"></repo>
+<repo name="osmosis-on-premise-driver"></repo>
+
 ## Keeper
 
 A computer running a blockchain client
@@ -47,18 +63,6 @@ Client libraries used by applications (such as Pleuston or Jupyter notebooks) to
 <repo name="squid-py"></repo>
 <repo name="squid-java"></repo>
 
-## OceanDB Drivers
-
-OceanDB is an off-chain database for storing metadata about [assets](/concepts/terminology/#asset-or-data-asset).
-
-<repo name="oceandb-mongodb-driver"></repo>
-<repo name="oceandb-bigchaindb-driver"></repo>
-<repo name="oceandb-elasticsearch-driver"></repo>
-
-These drivers are extended from a high-level module implementing OceanDB functions. You can create your own plugins based on its abstracted interface:
-
-<repo name="oceandb-driver-interface"></repo>
-
 ## Secret Store
 
 A [Parity Secret Store](https://wiki.parity.io/Secret-Store): software for distributed key pair generation, distributed key storage, and threshold retrieval. It's used to store [asset](/concepts/terminology/#asset-or-data-asset) access-control keys.
diff --git a/content/tutorials/get-ether-and-ocean-tokens.md b/content/tutorials/get-ether-and-ocean-tokens.md
index e4ce72cc..93c26bbe 100644
--- a/content/tutorials/get-ether-and-ocean-tokens.md
+++ b/content/tutorials/get-ether-and-ocean-tokens.md
@@ -39,15 +39,13 @@ If you're running a local Ganache-based testnet, then it creates several account
 
 That command uses [Ethereum's JSON RPC API](https://wiki.parity.io/JSONRPC.html). You can also create a new account using the Parity Ethereum CLI. See [the Parity Ethereum CLI documentation](https://wiki.parity.io/CLI-Sub-commands).
 
-**Option 2:** Import the `spree` seed phrase.
-
-By default `spree` is configured to bootstrap `10` initial accounts with a decent amount of ether on them. To get access to this accounts you can import the seed phrase for example in MetaMask or use an HD Wallet to access the accounts'
+**Option 2:** By default, the Spree testnet is configured to bootstrap ten accounts with a decent amount of Spree Ether in each one. To get access to those accounts, you can import the following seed phrase into MetaMask (e.g. by logging out and then clicking "Import using account seed phrase"):
 
 `taxi music thumb unique chat sand crew more leg another off lamp`
 
-Details about the bootstrapped accounts can be found here: [Barge](https://github.com/oceanprotocol/barge/#spree-network)
+Details about the bootstrapped accounts can be found in [the README.md file in the Barge repository](https://github.com/oceanprotocol/barge/#spree-network). They're the ones of type "mnemonic."
 
-**WARNING!** Never use any of those accounts any mainnet, this is for testing purpose only.
+**WARNING!** Never use any of those accounts in any mainnet. They are for testing purposes only.
 
 **Option 3:** Another option is to run [the Ocean faucet server](https://github.com/oceanprotocol/faucet) on your machine, with default configuration settings. The default settings enable it to dispense Spree Ether. To ask the faucet to send some Spree Ether to `<YOUR ADDRESS>`, use the command (a long command that wraps around):