diff --git a/config.go b/config.go
index 4a4e8aed..7b5a2556 100644
--- a/config.go
+++ b/config.go
@@ -47,7 +47,7 @@ type config struct {
 	DataDir            string        `short:"b" long:"datadir" description:"Directory to store data"`
 	AddPeers           []string      `short:"a" long:"addpeer" description:"Add a peer to connect with at startup"`
 	ConnectPeers       []string      `long:"connect" description:"Connect only to the specified peers at startup"`
-	DisableListen      bool          `long:"nolisten" description:"Disable listening for incoming connections -- NOTE: Listening is automatically disabled if the --connect option is used or if the --proxy option is used without the --tor option"`
+	DisableListen      bool          `long:"nolisten" description:"Disable listening for incoming connections -- NOTE: Listening is automatically disabled if the --connect or --proxy options are used without also specifying listen interfaces via --listen"`
 	Listeners          []string      `long:"listen" description:"Listen for connections on this interface/port (default all interfaces port: 8333, testnet: 18333)"`
 	MaxPeers           int           `long:"maxpeers" description:"Max number of inbound and outbound peers"`
 	BanDuration        time.Duration `long:"banduration" description:"How long to ban misbehaving peers.  Valid time units are {s, m, h}.  Minimum 1 second"`
diff --git a/mruinvmap.go b/mruinvmap.go
index 3fa0c1c6..c30acc3e 100644
--- a/mruinvmap.go
+++ b/mruinvmap.go
@@ -85,7 +85,7 @@ func (m *MruInventoryMap) Delete(iv *btcwire.InvVect) {
 // NewMruInventoryMap returns a new inventory map that is limited to the number
 // of entries specified by limit.  When the number of entries exceeds the limit,
 // the oldest (least recently used) entry will be removed to make room for the
-// new entry..
+// new entry.
 func NewMruInventoryMap(limit uint) *MruInventoryMap {
 	m := MruInventoryMap{
 		invMap:  make(map[btcwire.InvVect]*list.Element),
diff --git a/sample-btcd.conf b/sample-btcd.conf
index 0187dd11..07a5bafc 100644
--- a/sample-btcd.conf
+++ b/sample-btcd.conf
@@ -54,7 +54,7 @@
 ; addresses via the 'listen' option) and DNS seeding, so you will not be
 ; advertised as an available peer to the peers you connect to and won't accept
 ; connections from any other peers.  So, the 'connect' option effectively allows
-; you to only connect to "trusted" peers
+; you to only connect to "trusted" peers.
 ; ******************************************************************************
 
 ; Add persistent peers to connect to as desired.  One peer per line.
diff --git a/version.go b/version.go
index 5f7933b2..535faac9 100644
--- a/version.go
+++ b/version.go
@@ -33,7 +33,7 @@ var appBuild string
 // version returns the application version as a properly formed string per the
 // semantic versioning 2.0.0 spec (http://semver.org/).
 func version() string {
-	// Start with the major, minor, and path versions.
+	// Start with the major, minor, and patch versions.
 	version := fmt.Sprintf("%d.%d.%d", appMajor, appMinor, appPatch)
 
 	// Append pre-release version if there is one.  The hyphen called for