diff --git a/glide.lock b/glide.lock
index 63b3875d0..f0ede402e 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
 hash: d9724aa287c40d1b3856b6565f09235d809c8b2f7c6537c04f597137c0d6cd26
-updated: 2017-04-11T15:24:16.619608243-04:00
+updated: 2017-04-14T17:17:31.933202871-04:00
 imports:
 - name: github.com/btcsuite/btcd
   version: b8df516b4b267acf2de46be593a9d948d1d2c420
@@ -85,7 +85,7 @@ imports:
 - name: github.com/tendermint/go-clist
   version: 3baa390bbaf7634251c42ad69a8682e7e3990552
 - name: github.com/tendermint/go-common
-  version: 6af2364fa91ef2f3afc8ba0db33b66d9d3ae006c
+  version: 714fdaee3bb3f8670e721a75c5ddda8787b256dd
   subpackages:
   - test
 - name: github.com/tendermint/go-config
@@ -111,13 +111,13 @@ imports:
   subpackages:
   - upnp
 - name: github.com/tendermint/go-rpc
-  version: 9d18cbe74e66f875afa36d2fa3be280e4a2dc9e6
+  version: 4671c44b2d124f7f6f6243dbfbf4ae2bf42ee809
   subpackages:
   - client
   - server
   - types
 - name: github.com/tendermint/go-wire
-  version: 09dae074245a8042aa689d084af774e6ad6a90bb
+  version: 50889e2b4a9ba65b67be86a486f25853d514b937
 - name: github.com/tendermint/log15
   version: ae0f3d6450da9eac7074b439c8e1c3cabf0d5ce6
   subpackages:
@@ -166,12 +166,4 @@ imports:
   - stats
   - tap
   - transport
-testImports:
-- name: github.com/davecgh/go-spew
-  version: 6d212800a42e8ab5c146b8ace3490ee17e5225f9
-  subpackages:
-  - spew
-- name: github.com/pmezard/go-difflib
-  version: d8ed2627bdf02c080bf22230dbb337003b7aba2d
-  subpackages:
-  - difflib
+testImports: []
diff --git a/state/state.go b/state/state.go
index 1b90d3406..8a27104cd 100644
--- a/state/state.go
+++ b/state/state.go
@@ -147,7 +147,7 @@ func (s *State) SetBlockAndValidators(header *types.Header, blockPartsHeader typ
 	prevValSet := s.Validators.Copy()
 	nextValSet := prevValSet.Copy()
 
-	// update the validator set
+	// update the validator set with the latest abciResponses
 	err := updateValidators(nextValSet, s.abciResponses.Validators)
 	if err != nil {
 		log.Warn("Error changing validator set", "error", err)