diff --git a/consensus/state_test.go b/consensus/state_test.go
index 2606685a4..8b3693ec6 100644
--- a/consensus/state_test.go
+++ b/consensus/state_test.go
@@ -544,7 +544,7 @@ func TestLockPOLRelock(t *testing.T) {
 	// timeout to new round
 	<-timeoutWaitCh
 
-	//XXX: this isnt gauranteed to get there before the timeoutPropose ...
+	//XXX: this isnt guaranteed to get there before the timeoutPropose ...
 	cs1.SetProposalAndBlock(prop, propBlock, propBlockParts, "some peer")
 
 	<-newRoundCh
@@ -655,7 +655,7 @@ func TestLockPOLUnlock(t *testing.T) {
 	rs = re.(types.TMEventData).Unwrap().(types.EventDataRoundState).RoundState.(*RoundState)
 	lockedBlockHash := rs.LockedBlock.Hash()
 
-	//XXX: this isnt gauranteed to get there before the timeoutPropose ...
+	//XXX: this isnt guaranteed to get there before the timeoutPropose ...
 	cs1.SetProposalAndBlock(prop, propBlock, propBlockParts, "some peer")
 
 	<-newRoundCh
@@ -742,7 +742,7 @@ func TestLockPOLSafety1(t *testing.T) {
 
 	incrementRound(vs2, vs3, vs4)
 
-	//XXX: this isnt gauranteed to get there before the timeoutPropose ...
+	//XXX: this isnt guaranteed to get there before the timeoutPropose ...
 	cs1.SetProposalAndBlock(prop, propBlock, propBlockParts, "some peer")
 
 	<-newRoundCh
diff --git a/consensus/ticker.go b/consensus/ticker.go
index e869cdef1..e47a3412a 100644
--- a/consensus/ticker.go
+++ b/consensus/ticker.go
@@ -117,7 +117,7 @@ func (t *timeoutTicker) timeoutRoutine() {
 			t.Logger.Debug("Scheduled timeout", "dur", ti.Duration, "height", ti.Height, "round", ti.Round, "step", ti.Step)
 		case <-t.timer.C:
 			t.Logger.Info("Timed out", "dur", ti.Duration, "height", ti.Height, "round", ti.Round, "step", ti.Step)
-			// go routine here gaurantees timeoutRoutine doesn't block.
+			// go routine here guarantees timeoutRoutine doesn't block.
 			// Determinism comes from playback in the receiveRoutine.
 			// We can eliminate it by merging the timeoutRoutine into receiveRoutine
 			//  and managing the timeouts ourselves with a millisecond ticker
diff --git a/mempool/mempool.go b/mempool/mempool.go
index 9e53108e5..fd922ed8e 100644
--- a/mempool/mempool.go
+++ b/mempool/mempool.go
@@ -409,7 +409,7 @@ func (cache *txCache) Push(tx types.Tx) bool {
 		popped := cache.list.Front()
 		poppedTx := popped.Value.(types.Tx)
 		// NOTE: the tx may have already been removed from the map
-		// but deleting a non-existant element is fine
+		// but deleting a non-existent element is fine
 		delete(cache.map_, string(poppedTx))
 		cache.list.Remove(popped)
 	}
diff --git a/rpc/client/mock/abci.go b/rpc/client/mock/abci.go
index 0d1012557..71fa90b2a 100644
--- a/rpc/client/mock/abci.go
+++ b/rpc/client/mock/abci.go
@@ -40,7 +40,7 @@ func (a ABCIApp) BroadcastTxCommit(tx types.Tx) (*ctypes.ResultBroadcastTxCommit
 
 func (a ABCIApp) BroadcastTxAsync(tx types.Tx) (*ctypes.ResultBroadcastTx, error) {
 	c := a.App.CheckTx(tx)
-	// and this gets writen in a background thread...
+	// and this gets written in a background thread...
 	if c.IsOK() {
 		go func() { a.App.DeliverTx(tx) }()
 	}
@@ -49,7 +49,7 @@ func (a ABCIApp) BroadcastTxAsync(tx types.Tx) (*ctypes.ResultBroadcastTx, error
 
 func (a ABCIApp) BroadcastTxSync(tx types.Tx) (*ctypes.ResultBroadcastTx, error) {
 	c := a.App.CheckTx(tx)
-	// and this gets writen in a background thread...
+	// and this gets written in a background thread...
 	if c.IsOK() {
 		go func() { a.App.DeliverTx(tx) }()
 	}
diff --git a/rpc/core/mempool.go b/rpc/core/mempool.go
index 1988b05c6..5b794db79 100644
--- a/rpc/core/mempool.go
+++ b/rpc/core/mempool.go
@@ -75,7 +75,7 @@ func BroadcastTxCommit(tx types.Tx) (*ctypes.ResultBroadcastTxCommit, error) {
 
 	// Wait for the tx to be included in a block,
 	// timeout after something reasonable.
-	// TODO: configureable?
+	// TODO: configurable?
 	timer := time.NewTimer(60 * 2 * time.Second)
 	select {
 	case deliverTxRes := <-deliverTxResCh: