diff --git a/cmd/commands/utils.go b/cmd/commands/utils.go
index 7eea8cdeb..0f263d82a 100644
--- a/cmd/commands/utils.go
+++ b/cmd/commands/utils.go
@@ -5,9 +5,6 @@ import (
 	"fmt"
 	"os"
 	"path"
-	"regexp"
-	"strconv"
-	"strings"
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
diff --git a/cmd/counter/cmd.go b/cmd/counter/cmd.go
index cde1f0fd0..451f42a48 100644
--- a/cmd/counter/cmd.go
+++ b/cmd/counter/cmd.go
@@ -35,7 +35,7 @@ func init() {
 
 func counterTxCmd(cmd *cobra.Command, args []string) error {
 
-	countFee, err := commands.ParseCoins(countFeeFlag)
+	countFee, err := types.ParseCoins(countFeeFlag)
 	if err != nil {
 		return err
 	}
diff --git a/glide.lock b/glide.lock
index 366aee42a..bc150cd7d 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,16 +1,14 @@
-hash: a248393a241987824fbc93210d0d4c9202df819b2b015e9392d652393540cb19
-updated: 2017-04-18T23:03:02.314286469-04:00
+hash: c6e5febc35b5fd1003066820defb8a089db048b407239dad9faf44553fdc15e8
+updated: 2017-04-21T12:55:42.7004558-04:00
 imports:
 - name: github.com/btcsuite/btcd
   version: 4b348c1d33373d672edd83fc576892d0e46686d2
   subpackages:
   - btcec
 - name: github.com/BurntSushi/toml
-  version: e643e9ef00b049d75de26e61109c5ea01885cd21
+  version: b26d9c308763d68093482582cea63d69be07a0f0
 - name: github.com/ebuchman/fail-test
   version: 95f809107225be108efcf10a3509e4ea6ceef3c4
-- name: github.com/fsnotify/fsnotify
-  version: 4da3e2cfbabc9f751898f250b49f2439785783a1
 - name: github.com/go-stack/stack
   version: 100eb0c0a9c5b306ca2fb4f165df21d80ada4b82
 - name: github.com/golang/protobuf
@@ -22,49 +20,20 @@ imports:
   version: 553a641470496b2327abcac10b36396bd98e45c9
 - name: github.com/gorilla/websocket
   version: 3ab3a8b8831546bd18fd182c20687ca853b2bb13
-- name: github.com/hashicorp/hcl
-  version: 630949a3c5fa3c613328e1b8256052cbc2327c9b
-  subpackages:
-  - hcl/ast
-  - hcl/parser
-  - hcl/scanner
-  - hcl/strconv
-  - hcl/token
-  - json/parser
-  - json/scanner
-  - json/token
 - name: github.com/inconshreveable/mousetrap
   version: 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75
 - name: github.com/jmhodges/levigo
   version: c42d9e0ca023e2198120196f842701bb4c55d7b9
-- name: github.com/magiconair/properties
-  version: 51463bfca2576e06c62a8504b5c0f06d61312647
 - name: github.com/mattn/go-colorable
   version: ded68f7a9561c023e790de24279db7ebf473ea80
 - name: github.com/mattn/go-isatty
   version: fc9e8d8ef48496124e79ae0df75490096eccf6fe
-- name: github.com/mitchellh/mapstructure
-  version: 53818660ed4955e899c0bcafa97299a388bd7c8e
-- name: github.com/pelletier/go-buffruneio
-  version: c37440a7cf42ac63b919c752ca73a85067e05992
-- name: github.com/pelletier/go-toml
-  version: fe206efb84b2bc8e8cfafe6b4c1826622be969e3
 - name: github.com/pkg/errors
   version: ff09b135c25aae272398c51a07235b90a75aa4f0
-- name: github.com/spf13/afero
-  version: 9be650865eab0c12963d8753212f4f9c66cdcf12
-  subpackages:
-  - mem
-- name: github.com/spf13/cast
-  version: acbeb36b902d72a7a4c18e8f3241075e7ab763e4
 - name: github.com/spf13/cobra
-  version: b6cb3958937245a12d4d7728be080a6c758f4136
-- name: github.com/spf13/jwalterweatherman
-  version: fa7ca7e836cf3a8bb4ebf799f472c12d7e903d66
+  version: 10f6b9d7e1631a54ad07c5c0fb71c28a1abfd3c2
 - name: github.com/spf13/pflag
   version: 2300d0f8576fe575f71aaa5b9bbe4e1b0dc2eb51
-- name: github.com/spf13/viper
-  version: 0967fc9aceab2ce9da34061253ac10fb99bba5b2
 - name: github.com/syndtr/goleveldb
   version: 8c81ea47d4c41a385645e133e15510fc6a2a74b4
   subpackages:
@@ -81,7 +50,7 @@ imports:
   - leveldb/table
   - leveldb/util
 - name: github.com/tendermint/abci
-  version: af792eac777de757cd496349a5f6b5313738fcbc
+  version: 56e13d87f4e3ec1ea756957d6b23caa6ebcf0998
   subpackages:
   - client
   - example/dummy
@@ -98,6 +67,8 @@ imports:
   version: 3baa390bbaf7634251c42ad69a8682e7e3990552
 - name: github.com/tendermint/go-common
   version: f9e3db037330c8a8d61d3966de8473eaf01154fa
+- name: github.com/tendermint/go-config
+  version: 620dcbbd7d587cf3599dedbf329b64311b0c307a
 - name: github.com/tendermint/go-crypto
   version: 0ca2c6fdb0706001ca4c4b9b80c9f428e8cf39da
 - name: github.com/tendermint/go-data
@@ -115,11 +86,11 @@ imports:
 - name: github.com/tendermint/go-merkle
   version: 714d4d04557fd068a7c2a1748241ce8428015a96
 - name: github.com/tendermint/go-p2p
-  version: 4e802b363bdd843a40b0905e9791663bda4b1284
+  version: 17124989a93774833df33107fbf17157a7f8ef31
   subpackages:
   - upnp
 - name: github.com/tendermint/go-rpc
-  version: 4671c44b2d124f7f6f6243dbfbf4ae2bf42ee809
+  version: 559613689d56eaa423b19a3a4158546beb4857de
   subpackages:
   - client
   - server
@@ -136,7 +107,7 @@ imports:
   - app
   - client
 - name: github.com/tendermint/tendermint
-  version: de8952dd2ba7fd4697658f1a0ffc50e8cb690f9a
+  version: e8cad948e366cd1d0a9ebef642073f4ade9899e9
   subpackages:
   - blockchain
   - cmd/tendermint/commands
@@ -155,7 +126,7 @@ imports:
   - types
   - version
 - name: golang.org/x/crypto
-  version: 12c985af8526c1f6f0c463bbfd9d69623d13b323
+  version: 96846453c37f0876340a66a47f3f75b1f3a6cd2d
   subpackages:
   - curve25519
   - nacl/box
@@ -166,7 +137,7 @@ imports:
   - ripemd160
   - salsa20/salsa
 - name: golang.org/x/net
-  version: 5602c733f70afc6dcec6766be0d5034d4c4f14de
+  version: c8c74377599bd978aee1cf3b9b63a8634051cec2
   subpackages:
   - context
   - http2
@@ -176,11 +147,11 @@ imports:
   - lex/httplex
   - trace
 - name: golang.org/x/sys
-  version: f3918c30c5c2cb527c0b071a27c35120a6c0719a
+  version: ea9bcade75cb975a0b9738936568ab388b845617
   subpackages:
   - unix
 - name: golang.org/x/text
-  version: f4b4367115ec2de254587813edaa901bc1c723a8
+  version: 19e3104b43db45fca0303f489a9536087b184802
   subpackages:
   - secure/bidirule
   - transform
@@ -205,11 +176,9 @@ imports:
   - status
   - tap
   - transport
-- name: gopkg.in/yaml.v2
-  version: cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b
 testImports:
 - name: github.com/davecgh/go-spew
-  version: 04cdfd42973bb9c8589fd6a731800cf222fde1a9
+  version: 6d212800a42e8ab5c146b8ace3490ee17e5225f9
   subpackages:
   - spew
 - name: github.com/pmezard/go-difflib
@@ -217,7 +186,7 @@ testImports:
   subpackages:
   - difflib
 - name: github.com/stretchr/testify
-  version: 4d4bfba8f1d1027c4fdbe371823030df51419987
+  version: 69483b4bd14f5845b5a1e55bca19e954e827f1d0
   subpackages:
   - assert
   - require
diff --git a/glide.yaml b/glide.yaml
index 4396e8526..87735c19c 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -1,24 +1,24 @@
 package: github.com/tendermint/basecoin
 import:
 - package: github.com/tendermint/go-common
-  version: master
+  version: develop
 - package: github.com/tendermint/go-crypto
-  version: master
+  version: develop
 - package: github.com/tendermint/go-events
-  version: master
+  version: develop
 - package: github.com/tendermint/go-logger
-  version: master
+  version: develop
 - package: github.com/tendermint/go-data
-  version: master
+  version: develop
 - package: github.com/tendermint/go-rpc
   version: develop
 - package: github.com/tendermint/go-wire
-  version: master
+  version: develop
 - package: github.com/tendermint/merkleeyes
-  version: master
+  version: develop
 - package: github.com/tendermint/tendermint
-  version: viper
+  version: develop
 - package: github.com/tendermint/abci
-  version: master
+  version: develop
 - package: github.com/gorilla/websocket
   version: v1.1.0