diff --git a/cmd/ipfs/main.go b/cmd/ipfs/main.go
index 996d51713..02e9fa45d 100644
--- a/cmd/ipfs/main.go
+++ b/cmd/ipfs/main.go
@@ -1,3 +1,4 @@
+// cmd/ipfs implements the primary CLI binary for ipfs
 package main
 
 import (
diff --git a/core/commands/add.go b/core/commands/add.go
index 3dcebe6ad..7fc8d10a3 100644
--- a/core/commands/add.go
+++ b/core/commands/add.go
@@ -57,6 +57,7 @@ remains to be implemented.
 		cmds.BoolOption("quiet", "q", "Write minimal output"),
 		cmds.BoolOption(progressOptionName, "p", "Stream progress data"),
 		cmds.BoolOption(wrapOptionName, "w", "Wrap files with a directory object"),
+		cmds.BoolOption("t", "trickle", "Use trickle-dag format for dag generation"),
 	},
 	PreRun: func(req cmds.Request) error {
 		if quiet, _, _ := req.Option("quiet").Bool(); quiet {
diff --git a/core/core.go b/core/core.go
index bcfc8139b..3d4ef96cb 100644
--- a/core/core.go
+++ b/core/core.go
@@ -1,3 +1,5 @@
+// package core implements the IpfsNode object and methods for constructing
+// and properly setting it up.
 package core
 
 import (
diff --git a/exchange/bitswap/decision/engine.go b/exchange/bitswap/decision/engine.go
index 0a759ade3..e0f733929 100644
--- a/exchange/bitswap/decision/engine.go
+++ b/exchange/bitswap/decision/engine.go
@@ -1,3 +1,4 @@
+// package decision implements the decision engine for the bitswap service.
 package decision
 
 import (
diff --git a/exchange/bitswap/wantlist/wantlist.go b/exchange/bitswap/wantlist/wantlist.go
index ff6f0af1a..450fe3bd3 100644
--- a/exchange/bitswap/wantlist/wantlist.go
+++ b/exchange/bitswap/wantlist/wantlist.go
@@ -1,3 +1,5 @@
+// package wantlist implements an object for bitswap that contains the keys
+// that a given peer wants.
 package wantlist
 
 import (
diff --git a/namesys/interface.go b/namesys/interface.go
index f2e4f104d..6faaeaf6a 100644
--- a/namesys/interface.go
+++ b/namesys/interface.go
@@ -1,3 +1,4 @@
+// package namesys implements various functionality for the ipns naming system.
 package namesys
 
 import (