diff --git a/Dockerfile-withgo b/Dockerfile-withgo
index 5cb11e47b..306d16f3e 100644
--- a/Dockerfile-withgo
+++ b/Dockerfile-withgo
@@ -1,3 +1,6 @@
+# This Dockerfile is used for cluster testing - it produces a much larger image
+# and includes all of Go as well as some utilities.
+
 FROM golang:1.11
 
 LABEL maintainer "dev@pilosa.com"
@@ -7,6 +10,7 @@ COPY . /go/src/github.com/pilosa/pilosa/
 RUN cd /go/src/github.com/pilosa/pilosa \
     && CGO_ENABLED=0 make install-dep install FLAGS="-a"
 
+# download pumba for fault injection
 RUN wget https://github.com/alexei-led/pumba/releases/download/0.6.0/pumba_linux_amd64 -O /pumba
 RUN chmod +x /pumba
 
diff --git a/internal/clustertests/cluster_test.go b/internal/clustertests/cluster_test.go
index e63b95d0b..10ffc638c 100644
--- a/internal/clustertests/cluster_test.go
+++ b/internal/clustertests/cluster_test.go
@@ -58,6 +58,7 @@ func TestLongPauses(t *testing.T) {
 	if err != nil {
 		t.Fatalf("waiting on pumba pause cmd: %v", err)
 	}
+	// TODO change the sleep to wait for status to return to NORMAL or timeout once we have Status.State support in go-pilosa
 	fmt.Println("done with pause, waiting for stability")
 	time.Sleep(time.Second * 400)
 	fmt.Println("done waiting")
@@ -79,6 +80,7 @@ func getPilosaClient(t *testing.T) *pilosa.Client {
 		time.Sleep(time.Millisecond * 40)
 	}
 	time.Sleep(time.Second * 2)
+	// TODO uncomment the following once we get the version of go-pilosa that has the State field on Status.
 	// start := time.Now()
 	// for i := 0; true; i++ {
 	// 	s, err := cli.Status()