diff --git a/cluster.go b/cluster.go
index 0ed3dfcb2..55c57125e 100644
--- a/cluster.go
+++ b/cluster.go
@@ -152,7 +152,7 @@ func (c *Cluster) NodeStates() map[string]string {
 	return h
 }
 
-// State returns the internal ClusterState representation.
+// Status returns the internal ClusterState representation.
 func (c *Cluster) Status() *internal.ClusterStatus {
 	return &internal.ClusterStatus{
 		Nodes: encodeClusterStatus(c.Nodes),
diff --git a/config.go b/config.go
index d5d725ece..a0cfb977f 100644
--- a/config.go
+++ b/config.go
@@ -3,10 +3,16 @@ package pilosa
 import "time"
 
 const (
-	// DefaultHost is the default hostname and port to use.
-	DefaultHost         = "localhost"
-	DefaultPort         = "10101"
-	DefaultClusterType  = "static"
+	// DefaultHost is the default hostname to use.
+	DefaultHost = "localhost"
+
+	// DefaultPort is the default port use with the hostname.
+	DefaultPort = "10101"
+
+	// DefaultClusterType sets the node intercommunication method
+	DefaultClusterType = "static"
+
+	// DefaultInternalPort the port the nodes intercommunicate on
 	DefaultInternalPort = "14000"
 )
 
@@ -67,6 +73,7 @@ func (d *Duration) UnmarshalText(text []byte) error {
 	return nil
 }
 
+// MarshalText writes duration value in text format.
 func (d Duration) MarshalText() (text []byte, err error) {
 	return []byte(d.String()), nil
 }