diff --git a/doc/devel/args b/doc/devel/args
index 79ed9abd95..882a11a16e 100644
--- a/doc/devel/args
+++ b/doc/devel/args
@@ -22,8 +22,8 @@ ud                 D                 *      cd f     l  p   s uv
 * General flags:
 	-C Chase Referrals
 	-D Bind DN
-	-E Extensions
-	-e Extensions
+	-E CommandSpecific Extensions	(e.g., -E <[!]oid[=options]>*)
+	-e General Extensions			(e.g., -e <[!]oid[=options]>*)
 	-H URI
 	-P protocol version
 	-V version information
diff --git a/doc/devel/todo b/doc/devel/todo
index 54a7e0117b..817c8fbcd5 100644
--- a/doc/devel/todo
+++ b/doc/devel/todo
@@ -24,7 +24,7 @@ OpenLDAP 2.x Projects
 	client API update
 		Implement per referral callback
 	clients
-		referral chasing options/rebind proc
+		Implement referral chasing options w/ referral callback
 	Update manual pages
 
 
@@ -51,6 +51,8 @@ Implement localization
 
 Small projects
 --------------
+Implement -E/-e extensions options
+Implement -V version options
 Implement simple paged results control
 Implement whoami? (get-authzid) operation
 Implement proxy-grp operation/control