diff --git a/docs/README.md b/docs/README.md
index f47fafa114..77dfd1f3ff 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -62,5 +62,5 @@ NOTE: This documentation is a work-in-progress!
     - [Running a Node](clients/node.md) - Run a full node!
     - [Key Management](clients/keys.md) - Managing user keys
     - [CLI](clients/cli.md) - Queries and transactions via command line
-    - [REST](clients/rest.md) - Queries and transactions via REST
+    - [REST Light Client Daemon](clients/rest.md) - Queries and transactions via REST
       API
diff --git a/docs/clients/cli.md b/docs/clients/cli.md
index 46490cad91..dbd234d372 100644
--- a/docs/clients/cli.md
+++ b/docs/clients/cli.md
@@ -4,3 +4,5 @@ See `gaiacli --help` for more details.
 
 Also see the [testnet
 tutorial](https://github.com/cosmos/cosmos-sdk/tree/develop/cmd/gaia/testnets).
+
+TODO: cleanup the UX and document this properly.
diff --git a/docs/clients/key-management.md b/docs/clients/key-management.md
deleted file mode 100644
index 1474989b93..0000000000
--- a/docs/clients/key-management.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Key Management
-
-Here we cover many aspects of handling keys within the Cosmos SDK
-framework.
-
-// TODO add relevant key discussion
-(related https://github.com/tendermint/tendermint/blob/master/docs/spec/blockchain/encoding.md#public-key-cryptography)
diff --git a/docs/clients/keys.md b/docs/clients/keys.md
index 4b5a17cb3a..6d9732868d 100644
--- a/docs/clients/keys.md
+++ b/docs/clients/keys.md
@@ -1,6 +1,10 @@
 # Keys
 
+See the [Tendermint specification](https://github.com/tendermint/tendermint/blob/master/docs/spec/blockchain/encoding.md#public-key-cryptography) for how we work with keys.
+
 See `gaiacli keys --help`.
 
 Also see the [testnet
 tutorial](https://github.com/cosmos/cosmos-sdk/tree/develop/cmd/gaia/testnets).
+
+TODO: cleanup the UX and document this properly