diff --git a/docs/administration.md b/docs/administration.md
index 94eea518c..fca8db4dc 100644
--- a/docs/administration.md
+++ b/docs/administration.md
@@ -100,11 +100,15 @@ Note: This will only work when the replication factor is >= 2
 
 #### Metrics
 
-Pilosa can be configured to emit metrics on its internal processes in 2 formats, Expvar or StatsD.  Metric recording is disabled by default and enabled through the configuration file.  
-Through the configuration file choose the metric type, host to receive events, and polling interval for runtime metrics.
+Pilosa can be configured to emit metrics pertaining to its internal processes in one of two formats: Expvar or StatsD. Metric recording is disabled by default.
+The metrics configuration options are: 
+
+  - Host to receive events
+  - Polling interval for runtime metrics
+  - Metric type (StatsD, Expvar).
 
 ##### Tags
-StatsD Tags are in DataDog format (key:value), and we tag the following:
+StatsD Tags adhere to the DataDog format (key:value), and we tag the following:
 
 - NodeID
 - Index
@@ -121,19 +125,19 @@ We currently track the following events
 
 <strong id="maxSlice">MaxSlice:</strong> The Creation of a new Slice.
 
-<strong id="setbit">SetBit:</strong> Count of set bits on a row and column.
+<strong id="setbit">SetBit:</strong> Count of set bits.
 
-<strong id="clearbit">ClearBit:</strong> Count of cleared bits a previously set bit on a row and column.
+<strong id="clearbit">ClearBit:</strong> Count of cleared bits.
 
-<strong id="importbit">ImportBit:</strong> During a bulk data import this records the count of bits created.
+<strong id="importbit">ImportBit:</strong> During a bulk data import this represents the count of bits created.
 
-<strong id="setrowattrs">SetRowAttrs:</strong> Count of Attributes set per row
+<strong id="setrowattrs">SetRowAttrs:</strong> Count of Attributes set per row.
 
 <strong id="setcollumnattrs">SetColumnAttrs:</strong> Count of Attributes set per collumn.
 
-<strong id="bitmap">Bitmap:</strong> Count of Bitmap queries run.
+<strong id="bitmap">Bitmap:</strong> Count of Bitmap queries.
 
-<strong id="topn">TopN:</strong> Count of TopN queries run.
+<strong id="topn">TopN:</strong> Count of TopN queries.
 
 <strong id="union">Union:</strong> Count of Union queries.
 
@@ -149,6 +153,6 @@ We currently track the following events
 
 <strong id="blockrepair">BlockRepair:</strong> Count of data blocks that were out of sync and repaired.
 
-<strong id="garbage_collection">Garbage Collection:</strong> Event count when Garbage Collection occurs, 
+<strong id="garbage_collection">Garbage Collection:</strong> Event count when Garbage Collection occurs.
 
 <strong id="goroutines">Goroutines:</strong> Number of running Goroutines.
diff --git a/docs/configuration.md b/docs/configuration.md
index 9be899bf2..f93647cb5 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -168,7 +168,7 @@ Any flag that has a value that is a comma separated list on the command line bec
     cpu-time = "30s"
     ```
 ##### Metric Service
-* Description: which stats service to use (StatsD or ExpVar)
+* Description: Which stats service to use (StatsD or ExpVar).
 * Flag: `--metric.service=statsd`
 * Env: `PILOSA_METRIC.SERVICE=statsd'
 * Config:
@@ -179,7 +179,7 @@ Any flag that has a value that is a comma separated list on the command line bec
     ```
 
 ##### Metric Host
-* Description: where is the StatsD service hosted
+* Description: Address of the StatsD service host.
 * Flag: `--metric.host=localhost:8125`
 * Env: `PILOSA_METRIC.HOST=localhost:8125'
 * Config:
diff --git a/server/server_test.go b/server/server_test.go
index d677569e0..57037a0bc 100644
--- a/server/server_test.go
+++ b/server/server_test.go
@@ -449,7 +449,7 @@ func TestMain_SendReceiveMessage(t *testing.T) {
 		}
 	}
 	if !reflect.DeepEqual(received0, expected) {
-		t.Fatalf("unexpected schema on node0: %d", received0)
+		t.Fatalf("unexpected schema on node0: %s", received0)
 	}
 
 	// Make sure node1 knows about the index and frame created.
@@ -465,7 +465,7 @@ func TestMain_SendReceiveMessage(t *testing.T) {
 		}
 	}
 	if !reflect.DeepEqual(received1, expected) {
-		t.Fatalf("unexpected schema on node1: %d", received1)
+		t.Fatalf("unexpected schema on node1: %s", received1)
 	}
 
 	// Write data on first node.