diff --git a/README.md b/README.md
index b4b7a17..9ae43d5 100644
--- a/README.md
+++ b/README.md
@@ -40,25 +40,22 @@ Commands:
     Show help.
 
   dump [<flags>] [<file>...]
-    Display information about a certificate.
+    Display information about a certificate from a file/stdin.
 
   connect [<flags>] [<server:port>]
-    Connect to a server and print its certificate.
-
-  pem [<flags>] [<file>...]
-    Convert input to PEM-formatted blocks.
+    Connect to a server and print its certificate(s).
 ```
 
 ### Examples
 
 Display information about a certificate (from a file, or from stdin):
 
-<img src="https://cdn.rawgit.com/square/certigo/d162d5520fb1624ad5bc55ad4bbef406ca8f2a9d/examples/example_1.svg" width="100%" height="100%">
+<img src="https://cdn.rawgit.com/square/certigo/142ea7a63126d1366194cf0eb746abbac2eb3f09/examples/example_1.svg" width="100%" height="100%">
 
-Export certificates/keys from a JCEKS/PKCS12 keystore into PEM blocks:
+Export certificates/keys from a keystore into PEM blocks:
 
-<img src="https://cdn.rawgit.com/square/certigo/0a5ff1bfe36ca773052237681f7457101b0b3a64/examples/example_2.svg" width="100%" height="100%">
+<img src="https://cdn.rawgit.com/square/certigo/142ea7a63126d1366194cf0eb746abbac2eb3f09/examples/example_2.svg" width="100%" height="100%">
 
 Display information about a certificate from a remote server:
 
-<img src="https://cdn.rawgit.com/square/certigo/0a5ff1bfe36ca773052237681f7457101b0b3a64/examples/example_3.svg" width="100%" height="100%">
+<img src="https://cdn.rawgit.com/square/certigo/142ea7a63126d1366194cf0eb746abbac2eb3f09/examples/example_3.svg" width="100%" height="100%">
diff --git a/main.go b/main.go
index 1f575ab..4dad96c 100644
--- a/main.go
+++ b/main.go
@@ -43,12 +43,12 @@ import (
 var (
 	app = kingpin.New("certigo", "A command line certificate examination utility.")
 
-	dump      = app.Command("dump", "Display information about a certificate.")
+	dump      = app.Command("dump", "Display information about a certificate from a file/stdin.")
 	dumpFiles = dump.Arg("file", "Certificate file to dump (or stdin if not specified).").ExistingFiles()
 	dumpType  = dump.Flag("type", "Format of given input (PEM, DER, JCEKS, PKCS12; heuristic if missing).").String()
 	dumpPem   = dump.Flag("pem", "Write output as PEM blocks instead of human-readble format.").Bool()
 
-	connect       = app.Command("connect", "Connect to a server and print its certificate.")
+	connect       = app.Command("connect", "Connect to a server and print its certificate(s).")
 	connectTo     = connect.Arg("server:port", "Hostname or IP to connect to.").String()
 	connectName   = connect.Flag("name", "Override the server name used for Server Name Indication (SNI).").String()
 	connectCaPath = connect.Flag("ca", "Path to CA bundle (system default if unspecified).").ExistingFile()