diff --git a/cmd/lncli/cmd_macaroon.go b/cmd/lncli/cmd_macaroon.go
index 8b8848a2b..e5b170752 100644
--- a/cmd/lncli/cmd_macaroon.go
+++ b/cmd/lncli/cmd_macaroon.go
@@ -453,7 +453,7 @@ func constrainMacaroon(ctx *cli.Context) error {
 	// add first-party caveats (if necessary) to it.
 	sourceMac := &macaroon.Macaroon{}
 	if err = sourceMac.UnmarshalBinary(sourceMacBytes); err != nil {
-		return fmt.Errorf("error unmarshaling source macaroon file "+
+		return fmt.Errorf("error unmarshalling source macaroon file "+
 			"%s: %v", sourceMacFile, err)
 	}
 
diff --git a/cmd/lncli/peersrpc_active.go b/cmd/lncli/peersrpc_active.go
index 5ac94f2c7..c044166d3 100644
--- a/cmd/lncli/peersrpc_active.go
+++ b/cmd/lncli/peersrpc_active.go
@@ -38,7 +38,7 @@ func getPeersClient(ctx *cli.Context) (peersrpc.PeersClient, func()) {
 var updateNodeAnnouncementCommand = cli.Command{
 	Name:     "updatenodeannouncement",
 	Category: "Peers",
-	Usage:    "update and brodcast a new node announcement",
+	Usage:    "update and broadcast a new node announcement",
 	Description: `
 	Update the node's information and broadcast a new node announcement.
 
diff --git a/cmd/lncli/walletrpc_active.go b/cmd/lncli/walletrpc_active.go
index 3d8f6a471..de86900a7 100644
--- a/cmd/lncli/walletrpc_active.go
+++ b/cmd/lncli/walletrpc_active.go
@@ -1298,8 +1298,8 @@ var listAddressesCommand = cli.Command{
 	Flags: []cli.Flag{
 		cli.StringFlag{
 			Name: "account_name",
-			Usage: "(optional) only addreses matching this account " +
-				"are returned",
+			Usage: "(optional) only addresses matching this " +
+				"account are returned",
 		},
 		cli.BoolFlag{
 			Name: "show_custom_accounts",
diff --git a/kvdb/config.go b/kvdb/config.go
index 08fcc3ad9..821daa494 100644
--- a/kvdb/config.go
+++ b/kvdb/config.go
@@ -35,7 +35,7 @@ const (
 
 // BoltConfig holds bolt configuration.
 type BoltConfig struct {
-	NoFreelistSync bool `long:"nofreelistsync" description:"Whether the databases used within lnd should sync their freelist to disk. This is set to true by default, meaning we don't sync the free-list resulting in imporved memory performance during operation, but with an increase in startup time."`
+	NoFreelistSync bool `long:"nofreelistsync" description:"Whether the databases used within lnd should sync their freelist to disk. This is set to true by default, meaning we don't sync the free-list resulting in improved memory performance during operation, but with an increase in startup time."`
 
 	AutoCompact bool `long:"auto-compact" description:"Whether the databases used within lnd should automatically be compacted on every startup (and if the database has the configured minimum age). This is disabled by default because it requires additional disk space to be available during the compaction that is freed afterwards. In general compaction leads to smaller database files."`
 
diff --git a/kvdb/etcd/commit_queue.go b/kvdb/etcd/commit_queue.go
index e1afb4a8a..4ca10d05a 100644
--- a/kvdb/etcd/commit_queue.go
+++ b/kvdb/etcd/commit_queue.go
@@ -14,8 +14,8 @@ import (
 // retried. When a new transaction is added to the queue, we first upgrade the
 // read/write counts in the queue's own accounting to decide whether the new
 // transaction has any conflicting dependencies. If the transaction does not
-// conflict with any other, then it is comitted immediately, otherwise it'll be
-// queued up for later exection.
+// conflict with any other, then it is committed immediately, otherwise it'll be
+// queued up for later execution.
 // The algorithm is described in: http://www.cs.umd.edu/~abadi/papers/vll-vldb13.pdf
 type commitQueue struct {
 	ctx       context.Context
diff --git a/kvdb/etcd/readwrite_tx.go b/kvdb/etcd/readwrite_tx.go
index fcd1469ba..d690b6ecf 100644
--- a/kvdb/etcd/readwrite_tx.go
+++ b/kvdb/etcd/readwrite_tx.go
@@ -63,7 +63,7 @@ func (tx *readWriteTx) ForEachBucket(fn func(key []byte) error) error {
 	return root.ForEach(func(key []byte, val []byte) error {
 		if val != nil {
 			// A non-nil value would mean that we have a non
-			// walletdb/kvdb compatibel database containing
+			// walletdb/kvdb compatible database containing
 			// arbitrary key/values.
 			return walletdb.ErrInvalid
 		}
diff --git a/kvdb/readwrite_bucket_test.go b/kvdb/readwrite_bucket_test.go
index 46ac4c12a..29966391b 100644
--- a/kvdb/readwrite_bucket_test.go
+++ b/kvdb/readwrite_bucket_test.go
@@ -380,7 +380,7 @@ func testKeyClash(t *testing.T, db walletdb.DB) {
 }
 
 // TestBucketCreateDelete tests that creating then deleting then creating a
-// bucket suceeds.
+// bucket succeeds.
 func testBucketCreateDelete(t *testing.T, db walletdb.DB) {
 	err := Update(db, func(tx walletdb.ReadWriteTx) error {
 		apple, err := tx.CreateTopLevelBucket([]byte("apple"))