diff --git a/CHANGELOG.md b/CHANGELOG.md
index d72440bae02c..32214288919c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,248 @@
 # Changelog
 
+## 0.25.0
+
+*October 24th, 2018*
+
+BREAKING CHANGES
+
+* Gaia REST API (`gaiacli advanced rest-server`)
+    * [x/stake] Validator.Owner renamed to Validator.Operator
+    * [\#595](https://github.com/cosmos/cosmos-sdk/issues/595) Connections to the REST server are now secured using Transport Layer Security by default. The --insecure flag is provided to switch back to insecure HTTP.
+    * [gaia-lite] [\#2258](https://github.com/cosmos/cosmos-sdk/issues/2258) Split `GET stake/delegators/{delegatorAddr}` into `GET stake/delegators/{delegatorAddr}/delegations`, `GET stake/delegators/{delegatorAddr}/unbonding_delegations` and `GET stake/delegators/{delegatorAddr}/redelegations`
+
+* Gaia CLI  (`gaiacli`)
+    * [x/stake] Validator.Owner renamed to Validator.Operator
+    * [cli] unsafe_reset_all, show_validator, and show_node_id have been renamed to unsafe-reset-all, show-validator, and show-node-id
+    * [cli] [\#1983](https://github.com/cosmos/cosmos-sdk/issues/1983) --print-response now defaults to true in commands that create and send a transaction
+    * [cli] [\#1983](https://github.com/cosmos/cosmos-sdk/issues/1983) you can now pass --pubkey or --address to gaiacli keys show to return a plaintext representation of the key's address or public key for use with other commands
+    * [cli] [\#2061](https://github.com/cosmos/cosmos-sdk/issues/2061) changed proposalID in governance REST endpoints to proposal-id
+    * [cli] [\#2014](https://github.com/cosmos/cosmos-sdk/issues/2014) `gaiacli advanced` no longer exists - to access `ibc`, `rest-server`, and `validator-set` commands use `gaiacli ibc`, `gaiacli rest-server`, and `gaiacli tendermint`, respectively
+    * [makefile] `get_vendor_deps` no longer updates lock file it just updates vendor directory. Use `update_vendor_deps` to update the lock file. [#2152](https://github.com/cosmos/cosmos-sdk/pull/2152)
+    * [cli] [\#2221](https://github.com/cosmos/cosmos-sdk/issues/2221) All commands that
+    utilize a validator's operator address must now use the new Bech32 prefix,
+    `cosmosvaloper`.
+    * [cli] [\#2190](https://github.com/cosmos/cosmos-sdk/issues/2190) `gaiacli init --gen-txs` is now `gaiacli init --with-txs` to reduce confusion
+    * [cli] [\#2073](https://github.com/cosmos/cosmos-sdk/issues/2073) --from can now be either an address or a key name
+    * [cli] [\#1184](https://github.com/cosmos/cosmos-sdk/issues/1184) Subcommands reorganisation, see [\#2390](https://github.com/cosmos/cosmos-sdk/pull/2390) for a comprehensive list of changes.
+    * [cli] [\#2524](https://github.com/cosmos/cosmos-sdk/issues/2524) Add support offline mode to `gaiacli tx sign`. Lookups are not performed if the flag `--offline` is on.
+    * [cli] [\#2570](https://github.com/cosmos/cosmos-sdk/pull/2570) Add commands to query deposits on proposals
+
+* Gaia
+    * Make the transient store key use a distinct store key. [#2013](https://github.com/cosmos/cosmos-sdk/pull/2013)
+    * [x/stake] [\#1901](https://github.com/cosmos/cosmos-sdk/issues/1901) Validator type's Owner field renamed to Operator; Validator's GetOwner() renamed accordingly to comply with the SDK's Validator interface.
+    * [docs] [#2001](https://github.com/cosmos/cosmos-sdk/pull/2001) Update slashing spec for slashing period
+    * [x/stake, x/slashing] [#1305](https://github.com/cosmos/cosmos-sdk/issues/1305) - Rename "revoked" to "jailed"
+    * [x/stake] [#1676] Revoked and jailed validators put into the unbonding state
+    * [x/stake] [#1877] Redelegations/unbonding-delegation from unbonding validator have reduced time
+    * [x/slashing] [\#1789](https://github.com/cosmos/cosmos-sdk/issues/1789) Slashing changes for Tendermint validator set offset (NextValSet)
+    * [x/stake] [\#2040](https://github.com/cosmos/cosmos-sdk/issues/2040) Validator
+    operator type has now changed to `sdk.ValAddress`
+    * [x/stake] [\#2221](https://github.com/cosmos/cosmos-sdk/issues/2221) New
+    Bech32 prefixes have been introduced for a validator's consensus address and
+    public key: `cosmosvalcons` and `cosmosvalconspub` respectively. Also, existing Bech32 prefixes have been
+    renamed for accounts and validator operators:
+      * `cosmosaccaddr` / `cosmosaccpub` => `cosmos` / `cosmospub`
+      * `cosmosvaladdr` / `cosmosvalpub` => `cosmosvaloper` / `cosmosvaloperpub`
+    * [x/stake] [#1013] TendermintUpdates now uses transient store
+    * [x/stake] [\#2435](https://github.com/cosmos/cosmos-sdk/issues/2435) Remove empty bytes from the ValidatorPowerRank store key
+    * [x/gov] [#2195] Governance uses BFT Time
+    * [x/gov] [\#2256](https://github.com/cosmos/cosmos-sdk/issues/2256) Removed slashing for governance non-voting validators
+    * [simulation] [\#2162](https://github.com/cosmos/cosmos-sdk/issues/2162) Added back correct supply invariants
+    * [x/slashing] [\#2430](https://github.com/cosmos/cosmos-sdk/issues/2430) Simulate more slashes, check if validator is jailed before jailing
+    * [x/stake] [\#2393](https://github.com/cosmos/cosmos-sdk/issues/2393) Removed `CompleteUnbonding` and `CompleteRedelegation` Msg types, and instead added unbonding/redelegation queues to endblocker
+    * [x/mock/simulation] [\#2501](https://github.com/cosmos/cosmos-sdk/issues/2501) Simulate transactions & invariants for fee distribution, and fix bugs discovered in the process
+      * [x/auth] Simulate random fee payments
+      * [cmd/gaia/app] Simulate non-zero inflation
+      * [x/stake] Call hooks correctly in several cases related to delegation/validator updates
+      * [x/stake] Check full supply invariants, including yet-to-be-withdrawn fees
+      * [x/stake] Remove no-longer-in-use store key
+      * [x/slashing] Call hooks correctly when a validator is slashed
+      * [x/slashing] Truncate withdrawals (unbonding, redelegation) and burn change
+      * [x/mock/simulation] Ensure the simulation cannot set a proposer address of nil
+      * [x/mock/simulation] Add more event logs on begin block / end block for clarity
+      * [x/mock/simulation] Correctly set validator power in abci.RequestBeginBlock
+      * [x/minting] Correctly call stake keeper to track inflated supply
+      * [x/distribution] Sanity check for nonexistent rewards
+      * [x/distribution] Truncate withdrawals and return change to the community pool
+      * [x/distribution] Add sanity checks for incorrect accum / total accum relations
+      * [x/distribution] Correctly calculate total power using Tendermint updates
+      * [x/distribution] Simulate withdrawal transactions
+      * [x/distribution] Fix a bug where the fee pool was not correctly tracked on WithdrawDelegatorRewardsAll
+    * [x/stake] [\#1673](https://github.com/cosmos/cosmos-sdk/issues/1673) Validators are no longer deleted until they can no longer possibly be slashed
+    * [\#1890](https://github.com/cosmos/cosmos-sdk/issues/1890) Start chain with initial state + sequence of transactions
+      * [cli] Rename `gaiad init gentx` to `gaiad gentx`.
+      * [cli] Add `--skip-genesis` flag to `gaiad init` to prevent `genesis.json` generation.
+      * Drop `GenesisTx` in favor of a signed `StdTx` with only one `MsgCreateValidator` message.
+      * [cli] Port `gaiad init` and `gaiad testnet` to work with `StdTx` genesis transactions.
+      * [cli] Add `--moniker` flag to `gaiad init` to override moniker when generating `genesis.json` - i.e. it takes effect when running with the `--with-txs` flag, it is ignored otherwise.
+
+* SDK
+    * [core] [\#2219](https://github.com/cosmos/cosmos-sdk/issues/2219) Update to Tendermint 0.24.0
+      * Validator set updates delayed by one block
+      * BFT timestamp that can safely be used by applications
+      * Fixed maximum block size enforcement
+    * [core] [\#1807](https://github.com/cosmos/cosmos-sdk/issues/1807) Switch from use of rational to decimal
+    * [types] [\#1901](https://github.com/cosmos/cosmos-sdk/issues/1901) Validator interface's GetOwner() renamed to GetOperator()
+    * [x/slashing] [#2122](https://github.com/cosmos/cosmos-sdk/pull/2122) - Implement slashing period
+    * [types] [\#2119](https://github.com/cosmos/cosmos-sdk/issues/2119) Parsed error messages and ABCI log errors to make     them more human readable.
+    * [types] [\#2407](https://github.com/cosmos/cosmos-sdk/issues/2407) MulInt method added to big decimal in order to improve efficiency of slashing
+    * [simulation] Rename TestAndRunTx to Operation [#2153](https://github.com/cosmos/cosmos-sdk/pull/2153)
+    * [simulation] Remove log and testing.TB from Operation and Invariants, in favor of using errors [\#2282](https://github.com/cosmos/cosmos-sdk/issues/2282)
+    * [simulation] Remove usage of keys and addrs in the types, in favor of simulation.Account [\#2384](https://github.com/cosmos/cosmos-sdk/issues/2384)
+    * [tools] Removed gocyclo [#2211](https://github.com/cosmos/cosmos-sdk/issues/2211)
+    * [baseapp] Remove `SetTxDecoder` in favor of requiring the decoder be set in baseapp initialization. [#1441](https://github.com/cosmos/cosmos-sdk/issues/1441)
+    * [baseapp] [\#1921](https://github.com/cosmos/cosmos-sdk/issues/1921) Add minimumFees field to BaseApp.
+    * [store] Change storeInfo within the root multistore to use tmhash instead of ripemd160 [\#2308](https://github.com/cosmos/cosmos-sdk/issues/2308)
+    * [codec] [\#2324](https://github.com/cosmos/cosmos-sdk/issues/2324) All referrences to wire have been renamed to codec. Additionally, wire.NewCodec is now codec.New().
+    * [types] [\#2343](https://github.com/cosmos/cosmos-sdk/issues/2343) Make sdk.Msg have a names field, to facilitate automatic tagging.
+    * [baseapp] [\#2366](https://github.com/cosmos/cosmos-sdk/issues/2366) Automatically add action tags to all messages
+    * [x/auth] [\#2377](https://github.com/cosmos/cosmos-sdk/issues/2377) auth.StdSignMsg -> txbuilder.StdSignMsg
+    * [x/staking] [\#2244](https://github.com/cosmos/cosmos-sdk/issues/2244) staking now holds a consensus-address-index instead of a consensus-pubkey-index
+    * [x/staking] [\#2236](https://github.com/cosmos/cosmos-sdk/issues/2236) more distribution hooks for distribution
+    * [x/stake] [\#2394](https://github.com/cosmos/cosmos-sdk/issues/2394) Split up UpdateValidator into distinct state transitions applied only in EndBlock
+    * [x/slashing] [\#2480](https://github.com/cosmos/cosmos-sdk/issues/2480) Fix signing info handling bugs & faulty slashing
+    * [x/stake] [\#2412](https://github.com/cosmos/cosmos-sdk/issues/2412) Added an unbonding validator queue to EndBlock to automatically update validator.Status when finished Unbonding
+    * [x/stake] [\#2500](https://github.com/cosmos/cosmos-sdk/issues/2500) Block conflicting redelegations until we add an index
+    * [x/params] Global Paramstore refactored
+    * [types] [\#2506](https://github.com/cosmos/cosmos-sdk/issues/2506) sdk.Dec MarshalJSON now marshals as a normal Decimal, with 10 digits of decimal precision
+    * [x/stake] [\#2508](https://github.com/cosmos/cosmos-sdk/issues/2508) Utilize Tendermint power for validator power key
+    * [x/stake] [\#2531](https://github.com/cosmos/cosmos-sdk/issues/2531) Remove all inflation logic
+    * [x/mint] [\#2531](https://github.com/cosmos/cosmos-sdk/issues/2531) Add minting module and inflation logic
+    * [x/auth] [\#2540](https://github.com/cosmos/cosmos-sdk/issues/2540) Rename `AccountMapper` to `AccountKeeper`.
+    * [types] [\#2456](https://github.com/cosmos/cosmos-sdk/issues/2456) Renamed msg.Name() and msg.Type() to msg.Type() and msg.Route() respectively
+
+* Tendermint
+  * Update tendermint version from v0.23.0 to v0.25.0, notable changes
+    * Mempool now won't build too large blocks, or too computationally expensive blocks
+    * Maximum tx sizes and gas are now removed, and are implicitly the blocks maximums
+    * ABCI validators no longer send the pubkey. The pubkey is only sent in validator updates
+    * Validator set changes are now delayed by one block
+    * Block header now includes the next validator sets hash
+    * BFT time is implemented
+    * Secp256k1 signature format has changed
+    * There is now a threshold multisig format
+    * See the [tendermint changelog](https://github.com/tendermint/tendermint/blob/master/CHANGELOG.md) for other changes.
+
+FEATURES
+
+* Gaia REST API (`gaiacli advanced rest-server`)
+  * [gaia-lite] Endpoints to query staking pool and params
+  * [gaia-lite] [\#2110](https://github.com/cosmos/cosmos-sdk/issues/2110) Add support for `simulate=true` requests query argument to endpoints that send txs to run simulations of transactions
+  * [gaia-lite] [\#966](https://github.com/cosmos/cosmos-sdk/issues/966) Add support for `generate_only=true` query argument to generate offline unsigned transactions
+  * [gaia-lite] [\#1953](https://github.com/cosmos/cosmos-sdk/issues/1953) Add /sign endpoint to sign transactions generated with `generate_only=true`.
+  * [gaia-lite] [\#1954](https://github.com/cosmos/cosmos-sdk/issues/1954) Add /broadcast endpoint to broadcast transactions signed by the /sign endpoint.
+  * [gaia-lite] [\#2113](https://github.com/cosmos/cosmos-sdk/issues/2113) Rename `/accounts/{address}/send` to `/bank/accounts/{address}/transfers`, rename `/accounts/{address}` to `/auth/accounts/{address}`, replace `proposal-id` with `proposalId` in all gov endpoints
+  * [gaia-lite] [\#2478](https://github.com/cosmos/cosmos-sdk/issues/2478) Add query gov proposal's deposits endpoint
+  * [gaia-lite] [\#2477](https://github.com/cosmos/cosmos-sdk/issues/2477) Add query validator's outgoing redelegations and unbonding delegations endpoints
+
+* Gaia CLI  (`gaiacli`)
+  * [cli] Cmds to query staking pool and params
+  * [gov][cli] #2062 added `--proposal` flag to `submit-proposal` that allows a JSON file containing a proposal to be passed in
+  * [\#2040](https://github.com/cosmos/cosmos-sdk/issues/2040) Add `--bech` to `gaiacli keys show` and respective REST endpoint to
+  provide desired Bech32 prefix encoding
+  * [cli] [\#2047](https://github.com/cosmos/cosmos-sdk/issues/2047) [\#2306](https://github.com/cosmos/cosmos-sdk/pull/2306) Passing --gas=simulate triggers a simulation of the tx before the actual execution.
+  The gas estimate obtained via the simulation will be used as gas limit in the actual execution.
+  * [cli] [\#2047](https://github.com/cosmos/cosmos-sdk/issues/2047) The --gas-adjustment flag can be used to adjust the estimate obtained via the simulation triggered by --gas=simulate.
+  * [cli] [\#2110](https://github.com/cosmos/cosmos-sdk/issues/2110) Add --dry-run flag to perform a simulation of a transaction without broadcasting it. The --gas flag is ignored as gas would be automatically estimated.
+  * [cli] [\#2204](https://github.com/cosmos/cosmos-sdk/issues/2204) Support generating and broadcasting messages with multiple signatures via command line:
+    * [\#966](https://github.com/cosmos/cosmos-sdk/issues/966) Add --generate-only flag to build an unsigned transaction and write it to STDOUT.
+    * [\#1953](https://github.com/cosmos/cosmos-sdk/issues/1953) New `sign` command to sign transactions generated with the --generate-only flag.
+    * [\#1954](https://github.com/cosmos/cosmos-sdk/issues/1954) New `broadcast` command to broadcast transactions generated offline and signed with the `sign` command.
+  * [cli] [\#2220](https://github.com/cosmos/cosmos-sdk/issues/2220) Add `gaiacli config` feature to interactively create CLI config files to reduce the number of required flags
+  * [stake][cli] [\#1672](https://github.com/cosmos/cosmos-sdk/issues/1672) Introduced
+  new commission flags for validator commands `create-validator` and `edit-validator`.
+  * [stake][cli] [\#1890](https://github.com/cosmos/cosmos-sdk/issues/1890) Add `--genesis-format` flag to `gaiacli tx create-validator` to produce transactions in genesis-friendly format.
+  * [cli][\#2554](https://github.com/cosmos/cosmos-sdk/issues/2554) Make `gaiacli keys show` multisig ready.
+
+* Gaia
+  * [cli] #2170 added ability to show the node's address via `gaiad tendermint show-address`
+  * [simulation] #2313 Reworked `make test_sim_gaia_slow` to `make test_sim_gaia_full`, now simulates from multiple starting seeds in parallel
+  * [cli] [\#1921] (https://github.com/cosmos/cosmos-sdk/issues/1921)
+    * New configuration file `gaiad.toml` is now created to host Gaia-specific configuration.
+    * New --minimum_fees/minimum_fees flag/config option to set a minimum fee.
+
+* SDK
+  * [querier] added custom querier functionality, so ABCI query requests can be handled by keepers
+  * [simulation] [\#1924](https://github.com/cosmos/cosmos-sdk/issues/1924) allow operations to specify future operations
+  * [simulation] [\#1924](https://github.com/cosmos/cosmos-sdk/issues/1924) Add benchmarking capabilities, with makefile commands "test_sim_gaia_benchmark, test_sim_gaia_profile"
+  * [simulation] [\#2349](https://github.com/cosmos/cosmos-sdk/issues/2349) Add time-based future scheduled operations to simulator
+  * [x/auth] [\#2376](https://github.com/cosmos/cosmos-sdk/issues/2376) Remove FeePayer() from StdTx
+  * [x/stake] [\#1672](https://github.com/cosmos/cosmos-sdk/issues/1672) Implement
+  basis for the validator commission model.
+  * [x/auth] Support account removal in the account mapper.
+
+
+IMPROVEMENTS
+* [tools] Improved terraform and ansible scripts for infrastructure deployment
+* [tools] Added ansible script to enable process core dumps
+
+* Gaia REST API (`gaiacli advanced rest-server`)
+    * [x/stake] [\#2000](https://github.com/cosmos/cosmos-sdk/issues/2000) Added tests for new staking endpoints
+    * [gaia-lite] [\#2445](https://github.com/cosmos/cosmos-sdk/issues/2445) Standarized REST error responses
+    * [gaia-lite] Added example to Swagger specification for /keys/seed.
+    * [x/stake] Refactor REST utils
+
+* Gaia CLI  (`gaiacli`)
+    * [cli] #2060 removed `--select` from `block` command
+    * [cli] #2128 fixed segfault when exporting directly after `gaiad init`
+    * [cli] [\#1255](https://github.com/cosmos/cosmos-sdk/issues/1255) open KeyBase in read-only mode
+     for query-purpose CLI commands
+
+* Gaia
+    * [x/stake] [#2023](https://github.com/cosmos/cosmos-sdk/pull/2023) Terminate iteration loop in `UpdateBondedValidators` and `UpdateBondedValidatorsFull` when the first revoked validator is encountered and perform a sanity check.
+    * [x/auth] Signature verification's gas cost now accounts for pubkey type. [#2046](https://github.com/tendermint/tendermint/pull/2046)
+    * [x/stake] [x/slashing] Ensure delegation invariants to jailed validators [#1883](https://github.com/cosmos/cosmos-sdk/issues/1883).
+    * [x/stake] Improve speed of GetValidator, which was shown to be a performance bottleneck. [#2046](https://github.com/tendermint/tendermint/pull/2200)
+    * [x/stake] [\#2435](https://github.com/cosmos/cosmos-sdk/issues/2435) Improve memory efficiency of getting the various store keys
+    * [genesis] [\#2229](https://github.com/cosmos/cosmos-sdk/issues/2229) Ensure that there are no duplicate accounts or validators in the genesis state.
+    * [genesis] [\#2450](https://github.com/cosmos/cosmos-sdk/issues/2450) Validate staking genesis parameters.
+    * Add SDK validation to `config.toml` (namely disabling `create_empty_blocks`) [\#1571](https://github.com/cosmos/cosmos-sdk/issues/1571)
+    * [\#1941](https://github.com/cosmos/cosmos-sdk/issues/1941)(https://github.com/cosmos/cosmos-sdk/issues/1941) Version is now inferred via `git describe --tags`.
+    * [x/distribution] [\#1671](https://github.com/cosmos/cosmos-sdk/issues/1671) add distribution types and tests
+
+* SDK
+    * [tools] Make get_vendor_deps deletes `.vendor-new` directories, in case scratch files are present.
+    * [spec] Added simple piggy bank distribution spec
+    * [cli] [\#1632](https://github.com/cosmos/cosmos-sdk/issues/1632) Add integration tests to ensure `basecoind init && basecoind` start sequences run successfully for both `democoin` and `basecoin` examples.
+    * [store] Speedup IAVL iteration, and consequently everything that requires IAVL iteration. [#2143](https://github.com/cosmos/cosmos-sdk/issues/2143)
+    * [store] [\#1952](https://github.com/cosmos/cosmos-sdk/issues/1952), [\#2281](https://github.com/cosmos/cosmos-sdk/issues/2281) Update IAVL dependency to v0.11.0
+    * [simulation] Make timestamps randomized [#2153](https://github.com/cosmos/cosmos-sdk/pull/2153)
+    * [simulation] Make logs not just pure strings, speeding it up by a large factor at greater block heights [\#2282](https://github.com/cosmos/cosmos-sdk/issues/2282)
+    * [simulation] Add a concept of weighting the operations [\#2303](https://github.com/cosmos/cosmos-sdk/issues/2303)
+    * [simulation] Logs get written to file if large, and also get printed on panics [\#2285](https://github.com/cosmos/cosmos-sdk/issues/2285)
+    * [simulation] Bank simulations now makes testing auth configurable [\#2425](https://github.com/cosmos/cosmos-sdk/issues/2425)
+    * [gaiad] [\#1992](https://github.com/cosmos/cosmos-sdk/issues/1992) Add optional flag to `gaiad testnet` to make config directory of daemon (default `gaiad`) and cli (default `gaiacli`) configurable
+    * [x/stake] Add stake `Queriers` for Gaia-lite endpoints. This increases the staking endpoints performance by reusing the staking `keeper` logic for queries. [#2249](https://github.com/cosmos/cosmos-sdk/pull/2149)
+    * [store] [\#2017](https://github.com/cosmos/cosmos-sdk/issues/2017) Refactor
+    gas iterator gas consumption to only consume gas for iterator creation and `Next`
+    calls which includes dynamic consumption of value length.
+    * [types/decimal] [\#2378](https://github.com/cosmos/cosmos-sdk/issues/2378) - Added truncate functionality to decimal
+    * [client] [\#1184](https://github.com/cosmos/cosmos-sdk/issues/1184) Remove unused `client/tx/sign.go`.
+    * [tools] [\#2464](https://github.com/cosmos/cosmos-sdk/issues/2464) Lock binary dependencies to a specific version
+
+BUG FIXES
+
+* Gaia CLI  (`gaiacli`)
+    * [cli] [\#1997](https://github.com/cosmos/cosmos-sdk/issues/1997) Handle panics gracefully when `gaiacli stake {delegation,unbond}` fail to unmarshal delegation.
+    * [cli] [\#2265](https://github.com/cosmos/cosmos-sdk/issues/2265) Fix JSON formatting of the `gaiacli send` command.
+    * [cli] [\#2547](https://github.com/cosmos/cosmos-sdk/issues/2547) Mark --to and --amount as required flags for `gaiacli tx send`.
+
+* Gaia
+  * [x/stake] Return correct Tendermint validator update set on `EndBlocker` by not
+  including non previously bonded validators that have zero power. [#2189](https://github.com/cosmos/cosmos-sdk/issues/2189)
+
+* SDK
+    * [\#1988](https://github.com/cosmos/cosmos-sdk/issues/1988) Make us compile on OpenBSD (disable ledger) [#1988] (https://github.com/cosmos/cosmos-sdk/issues/1988)
+    * [\#2105](https://github.com/cosmos/cosmos-sdk/issues/2105) Fix DB Iterator leak, which may leak a go routine.
+    * [ledger] [\#2064](https://github.com/cosmos/cosmos-sdk/issues/2064) Fix inability to sign and send transactions via the LCD by
+    loading a Ledger device at runtime.
+    * [\#2158](https://github.com/cosmos/cosmos-sdk/issues/2158) Fix non-deterministic ordering of validator iteration when slashing in `gov EndBlocker`
+    * [simulation] [\#1924](https://github.com/cosmos/cosmos-sdk/issues/1924) Make simulation stop on SIGTERM
+    * [\#2388](https://github.com/cosmos/cosmos-sdk/issues/2388) Remove dependency on deprecated tendermint/tmlibs repository.
+    * [\#2416](https://github.com/cosmos/cosmos-sdk/issues/2416) Refactored
+    `InitializeTestLCD` to properly include proposing validator in genesis state.
+
 ## 0.24.2
 
 *August 22nd, 2018*
@@ -25,36 +268,36 @@ BUG FIXES
 BREAKING CHANGES
 
 * Gaia REST API (`gaiacli advanced rest-server`)
-  - [x/stake] \#1880 More REST-ful endpoints (large refactor)
-  - [x/slashing] \#1866 `/slashing/signing_info` takes cosmosvalpub instead of cosmosvaladdr
+  - [x/stake] [\#1880](https://github.com/cosmos/cosmos-sdk/issues/1880) More REST-ful endpoints (large refactor)
+  - [x/slashing] [\#1866](https://github.com/cosmos/cosmos-sdk/issues/1866) `/slashing/signing_info` takes cosmosvalpub instead of cosmosvaladdr
   - use time.Time instead of int64 for time. See Tendermint v0.23.0
   - Signatures are no longer Amino encoded with prefixes (just encoded as raw
     bytes) - see Tendermint v0.23.0
 
 * Gaia CLI  (`gaiacli`)
   -  [x/stake] change `--keybase-sig` to `--identity`
-  -  [x/stake] \#1828 Force user to specify amount on create-validator command by removing default
+  -  [x/stake] [\#1828](https://github.com/cosmos/cosmos-sdk/issues/1828) Force user to specify amount on create-validator command by removing default
   -  [x/gov] Change `--proposalID` to `--proposal-id`
-  -  [x/stake, x/gov] \#1606 Use `--from` instead of adhoc flags like `--address-validator`
+  -  [x/stake, x/gov] [\#1606](https://github.com/cosmos/cosmos-sdk/issues/1606) Use `--from` instead of adhoc flags like `--address-validator`
         and `--proposer` to indicate the sender address.
-  -  \#1551 Remove `--name` completely
+  -  [\#1551](https://github.com/cosmos/cosmos-sdk/issues/1551) Remove `--name` completely
   -  Genesis/key creation (`gaiad init`) now supports user-provided key passwords
 
 * Gaia
   - [x/stake] Inflation doesn't use rationals in calculation (performance boost)
   - [x/stake] Persist a map from `addr->pubkey` in the state since BeginBlock
     doesn't provide pubkeys.
-  - [x/gov] \#1781 Added tags sub-package, changed tags to use dash-case
-  - [x/gov] \#1688 Governance parameters are now stored in globalparams store
-  - [x/gov] \#1859 Slash validators who do not vote on a proposal
-  - [x/gov] \#1914 added TallyResult type that gets stored in Proposal after tallying is finished
+  - [x/gov] [\#1781](https://github.com/cosmos/cosmos-sdk/issues/1781) Added tags sub-package, changed tags to use dash-case
+  - [x/gov] [\#1688](https://github.com/cosmos/cosmos-sdk/issues/1688) Governance parameters are now stored in globalparams store
+  - [x/gov] [\#1859](https://github.com/cosmos/cosmos-sdk/issues/1859) Slash validators who do not vote on a proposal
+  - [x/gov] [\#1914](https://github.com/cosmos/cosmos-sdk/issues/1914) added TallyResult type that gets stored in Proposal after tallying is finished
 
 * SDK
   - [baseapp] Msgs are no longer run on CheckTx, removed `ctx.IsCheckTx()`
   - [baseapp] NewBaseApp constructor takes sdk.TxDecoder as argument instead of wire.Codec
   - [types] sdk.NewCoin takes sdk.Int, sdk.NewInt64Coin takes int64
   - [x/auth] Default TxDecoder can be found in `x/auth` rather than baseapp
-  - [client] \#1551: Refactored `CoreContext` to `TxContext` and `QueryContext`
+  - [client] [\#1551](https://github.com/cosmos/cosmos-sdk/issues/1551): Refactored `CoreContext` to `TxContext` and `QueryContext`
       - Removed all tx related fields and logic (building & signing) to separate
         structure `TxContext` in `x/auth/client/context`
 
@@ -74,7 +317,7 @@ FEATURES
 
 * Gaia CLI  (`gaiacli`)
     - [x/gov] added `query-proposals` command. Can filter by `depositer`, `voter`, and `status`
-    - [x/stake] \#2043 Added staking query cli cmds for unbonding-delegations and redelegations
+    - [x/stake] [\#2043](https://github.com/cosmos/cosmos-sdk/issues/2043) Added staking query cli cmds for unbonding-delegations and redelegations
 
 * Gaia
   - [networks] Added ansible scripts to upgrade seed nodes on a network
@@ -87,7 +330,7 @@ FEATURES
      - Simulates Tendermint's algorithm for validator set updates
      - Simulates validator signing/downtime with a Markov chain, and occaisional double-signatures
      - Includes simulated operations & invariants for staking, slashing, governance, and bank modules
-  - [store] \#1481 Add transient store
+  - [store] [\#1481](https://github.com/cosmos/cosmos-sdk/issues/1481) Add transient store
   - [baseapp] Initialize validator set on ResponseInitChain
   - [baseapp] added BaseApp.Seal - ability to seal baseapp parameters once they've been set
   - [cosmos-sdk-cli] New `cosmos-sdk-cli` tool to quickly initialize a new
@@ -97,41 +340,41 @@ FEATURES
 IMPROVEMENTS
 
 * Gaia
-  - [spec] \#967 Inflation and distribution specs drastically improved
-  - [x/gov] \#1773 Votes on a proposal can now be queried
+  - [spec] [\#967](https://github.com/cosmos/cosmos-sdk/issues/967) Inflation and distribution specs drastically improved
+  - [x/gov] [\#1773](https://github.com/cosmos/cosmos-sdk/issues/1773) Votes on a proposal can now be queried
   - [x/gov] Initial governance parameters can now be set in the genesis file
-  - [x/stake] \#1815 Sped up the processing of `EditValidator` txs.
-  - [config] \#1930 Transactions indexer indexes all tags by default.
+  - [x/stake] [\#1815](https://github.com/cosmos/cosmos-sdk/issues/1815) Sped up the processing of `EditValidator` txs.
+  - [config] [\#1930](https://github.com/cosmos/cosmos-sdk/issues/1930) Transactions indexer indexes all tags by default.
   - [ci] [#2057](https://github.com/cosmos/cosmos-sdk/pull/2057) Run `make localnet-start` on every commit and ensure network reaches at least 10 blocks
 
 * SDK
-  - [baseapp] \#1587 Allow any alphanumeric character in route
+  - [baseapp] [\#1587](https://github.com/cosmos/cosmos-sdk/issues/1587) Allow any alphanumeric character in route
   - [baseapp] Allow any alphanumeric character in route
   - [tools] Remove `rm -rf vendor/` from `make get_vendor_deps`
   - [x/auth] Recover ErrorOutOfGas panic in order to set sdk.Result attributes correctly
-  - [x/auth] \#2376 No longer runs any signature in a multi-msg, if any account/sequence number is wrong.
-  - [x/auth] \#2376 No longer charge gas for subtracting fees
+  - [x/auth] [\#2376](https://github.com/cosmos/cosmos-sdk/issues/2376) No longer runs any signature in a multi-msg, if any account/sequence number is wrong.
+  - [x/auth] [\#2376](https://github.com/cosmos/cosmos-sdk/issues/2376) No longer charge gas for subtracting fees
   - [x/bank] Unit tests are now table-driven
   - [tests] Add tests to example apps in docs
   - [tests] Fixes ansible scripts to work with AWS too
-  - [tests] \#1806 CLI tests are now behind the build flag 'cli_test', so go test works on a new repo
+  - [tests] [\#1806](https://github.com/cosmos/cosmos-sdk/issues/1806) CLI tests are now behind the build flag 'cli_test', so go test works on a new repo
 
 BUG FIXES
 
 * Gaia CLI  (`gaiacli`)
-  -  \#1766 Fixes bad example for keybase identity
-  -  [x/stake] \#2021 Fixed repeated CLI commands in staking
+  -  [\#1766](https://github.com/cosmos/cosmos-sdk/issues/1766) Fixes bad example for keybase identity
+  -  [x/stake] [\#2021](https://github.com/cosmos/cosmos-sdk/issues/2021) Fixed repeated CLI commands in staking
 
 * Gaia
   - [x/stake] [#2077](https://github.com/cosmos/cosmos-sdk/pull/2077) Fixed invalid cliff power comparison
-  - \#1804 Fixes gen-tx genesis generation logic temporarily until upstream updates
-  - \#1799 Fix `gaiad export`
-  - \#1839 Fixed bug where intra-tx counter wasn't set correctly for genesis validators
-  - [x/stake] \#1858 Fixed bug where the cliff validator was not updated correctly
-  - [tests] \#1675 Fix non-deterministic `test_cover`
-  - [tests] \#1551 Fixed invalid LCD test JSON payload in `doIBCTransfer`
+  - [\#1804](https://github.com/cosmos/cosmos-sdk/issues/1804) Fixes gen-tx genesis generation logic temporarily until upstream updates
+  - [\#1799](https://github.com/cosmos/cosmos-sdk/issues/1799) Fix `gaiad export`
+  - [\#1839](https://github.com/cosmos/cosmos-sdk/issues/1839) Fixed bug where intra-tx counter wasn't set correctly for genesis validators
+  - [x/stake] [\#1858](https://github.com/cosmos/cosmos-sdk/issues/1858) Fixed bug where the cliff validator was not updated correctly
+  - [tests] [\#1675](https://github.com/cosmos/cosmos-sdk/issues/1675) Fix non-deterministic `test_cover`
+  - [tests] [\#1551](https://github.com/cosmos/cosmos-sdk/issues/1551) Fixed invalid LCD test JSON payload in `doIBCTransfer`
   - [basecoin] Fixes coin transaction failure and account query [discussion](https://forum.cosmos.network/t/unmarshalbinarybare-expected-to-read-prefix-bytes-75fbfab8-since-it-is-registered-concrete-but-got-0a141dfa/664/6)
-  - [x/gov] \#1757 Fix VoteOption conversion to String
+  - [x/gov] [\#1757](https://github.com/cosmos/cosmos-sdk/issues/1757) Fix VoteOption conversion to String
   * [x/stake] [#2083] Fix broken invariant of bonded validator power decrease
 
 ## 0.23.1
@@ -159,9 +402,9 @@ IMPROVEMENTS
 BUG FIXES
 * [tendermint] Update to v0.22.6
     - Fixes some security vulnerabilities reported in the [Bug Bounty](https://hackerone.com/tendermint)
-*  \#1797 Fix off-by-one error in slashing for downtime
-*  \#1787 Fixed bug where Tally fails due to revoked/unbonding validator
-*  \#1666 Add intra-tx counter to the genesis validators
+*  [\#1797](https://github.com/cosmos/cosmos-sdk/issues/1797) Fix off-by-one error in slashing for downtime
+*  [\#1787](https://github.com/cosmos/cosmos-sdk/issues/1787) Fixed bug where Tally fails due to revoked/unbonding validator
+*  [\#1666](https://github.com/cosmos/cosmos-sdk/issues/1666) Add intra-tx counter to the genesis validators
 
 ## 0.22.0
 
@@ -207,8 +450,8 @@ IMPROVEMENTS
 * [store] Pruning strategy configurable with pruning flag on gaiad start
 
 BUG FIXES
-* \#1630 - redelegation nolonger removes tokens from the delegator liquid account
-* [keys] \#1629 - updating password no longer asks for a new password when the first entered password was incorrect
+* [\#1630](https://github.com/cosmos/cosmos-sdk/issues/1630) - redelegation nolonger removes tokens from the delegator liquid account
+* [keys] [\#1629](https://github.com/cosmos/cosmos-sdk/issues/1629) - updating password no longer asks for a new password when the first entered password was incorrect
 * [lcd] importing an account would create a random account
 * [server] 'gaiad init' command family now writes provided name as the moniker in `config.toml`
 * [build] Added Ledger build support via `LEDGER_ENABLED=true|false`
@@ -324,9 +567,9 @@ IMPROVEMENTS
 * [docs] Added commands for governance CLI on testnet README
 
 BUG FIXES
-* [x/slashing] \#1510 Unrevoked validators cannot un-revoke themselves
-* [x/stake] \#1513 Validators slashed to zero power are unbonded and removed from the store
-* [x/stake] \#1567 Validators decreased in power but not unbonded are now updated in Tendermint
+* [x/slashing] [\#1510](https://github.com/cosmos/cosmos-sdk/issues/1510) Unrevoked validators cannot un-revoke themselves
+* [x/stake] [\#1513](https://github.com/cosmos/cosmos-sdk/issues/1513) Validators slashed to zero power are unbonded and removed from the store
+* [x/stake] [\#1567](https://github.com/cosmos/cosmos-sdk/issues/1567) Validators decreased in power but not unbonded are now updated in Tendermint
 * [x/stake] error strings lower case
 * [x/stake] pool loose tokens now accounts for unbonding and unbonding tokens not associated with any validator
 * [x/stake] fix revoke bytes ordering (was putting revoked candidates at the top of the list)
@@ -336,20 +579,20 @@ BUG FIXES
 * Retry on HTTP request failure in CLI tests, add option to retry tests in Makefile
 * Fixed bug where chain ID wasn't passed properly in x/bank REST handler, removed Viper hack from ante handler
 * Fixed bug where `democli account` didn't decode the account data correctly
-* \#872  - recovery phrases no longer all end in `abandon`
-* \#887  - limit the size of rationals that can be passed in from user input
-* \#1052 - Make all now works
-* \#1258 - printing big.rat's can no longer overflow int64
-* \#1259 - fix bug where certain tests that could have a nil pointer in defer
-* \#1343 - fixed unnecessary parallelism in CI
-* \#1353 - CLI: Show pool shares fractions in human-readable format
-* \#1367 - set ChainID in InitChain
-* \#1461 - CLI tests now no longer reset your local environment data
-* \#1505 - `gaiacli stake validator` no longer panics if validator doesn't exist
-* \#1565 - fix cliff validator persisting when validator set shrinks from max
-* \#1287 - prevent zero power validators at genesis
+* [\#872](https://github.com/cosmos/cosmos-sdk/issues/872)  - recovery phrases no longer all end in `abandon`
+* [\#887](https://github.com/cosmos/cosmos-sdk/issues/887)  - limit the size of rationals that can be passed in from user input
+* [\#1052](https://github.com/cosmos/cosmos-sdk/issues/1052) - Make all now works
+* [\#1258](https://github.com/cosmos/cosmos-sdk/issues/1258) - printing big.rat's can no longer overflow int64
+* [\#1259](https://github.com/cosmos/cosmos-sdk/issues/1259) - fix bug where certain tests that could have a nil pointer in defer
+* [\#1343](https://github.com/cosmos/cosmos-sdk/issues/1343) - fixed unnecessary parallelism in CI
+* [\#1353](https://github.com/cosmos/cosmos-sdk/issues/1353) - CLI: Show pool shares fractions in human-readable format
+* [\#1367](https://github.com/cosmos/cosmos-sdk/issues/1367) - set ChainID in InitChain
+* [\#1461](https://github.com/cosmos/cosmos-sdk/issues/1461) - CLI tests now no longer reset your local environment data
+* [\#1505](https://github.com/cosmos/cosmos-sdk/issues/1505) - `gaiacli stake validator` no longer panics if validator doesn't exist
+* [\#1565](https://github.com/cosmos/cosmos-sdk/issues/1565) - fix cliff validator persisting when validator set shrinks from max
+* [\#1287](https://github.com/cosmos/cosmos-sdk/issues/1287) - prevent zero power validators at genesis
 * [x/stake] fix bug when unbonding/redelegating using `--shares-percent`
-* \#1010 - two validators can't bond with the same pubkey anymore
+* [\#1010](https://github.com/cosmos/cosmos-sdk/issues/1010) - two validators can't bond with the same pubkey anymore
 
 
 ## 0.19.0
diff --git a/PENDING.md b/PENDING.md
index 58a31f82b7cd..4d87301f0d5b 100644
--- a/PENDING.md
+++ b/PENDING.md
@@ -3,246 +3,50 @@
 BREAKING CHANGES
 
 * Gaia REST API (`gaiacli advanced rest-server`)
-    * [x/stake] Validator.Owner renamed to Validator.Operator
-    * [\#595](https://github.com/cosmos/cosmos-sdk/issues/595) Connections to the REST server are now secured using Transport Layer Security by default. The --insecure flag is provided to switch back to insecure HTTP.
-    * [gaia-lite] [\#2258](https://github.com/cosmos/cosmos-sdk/issues/2258) Split `GET stake/delegators/{delegatorAddr}` into `GET stake/delegators/{delegatorAddr}/delegations`, `GET stake/delegators/{delegatorAddr}/unbonding_delegations` and `GET stake/delegators/{delegatorAddr}/redelegations`
 
 * Gaia CLI  (`gaiacli`)
-    * [x/stake] Validator.Owner renamed to Validator.Operator
-    * [cli] unsafe_reset_all, show_validator, and show_node_id have been renamed to unsafe-reset-all, show-validator, and show-node-id
-    * [cli] [\#1983](https://github.com/cosmos/cosmos-sdk/issues/1983) --print-response now defaults to true in commands that create and send a transaction
-    * [cli] [\#1983](https://github.com/cosmos/cosmos-sdk/issues/1983) you can now pass --pubkey or --address to gaiacli keys show to return a plaintext representation of the key's address or public key for use with other commands
-    * [cli] [\#2061](https://github.com/cosmos/cosmos-sdk/issues/2061) changed proposalID in governance REST endpoints to proposal-id
-    * [cli] [\#2014](https://github.com/cosmos/cosmos-sdk/issues/2014) `gaiacli advanced` no longer exists - to access `ibc`, `rest-server`, and `validator-set` commands use `gaiacli ibc`, `gaiacli rest-server`, and `gaiacli tendermint`, respectively
-    * [makefile] `get_vendor_deps` no longer updates lock file it just updates vendor directory. Use `update_vendor_deps` to update the lock file. [#2152](https://github.com/cosmos/cosmos-sdk/pull/2152)
-    * [cli] [\#2221](https://github.com/cosmos/cosmos-sdk/issues/2221) All commands that
-    utilize a validator's operator address must now use the new Bech32 prefix,
-    `cosmosvaloper`.
-    * [cli] [\#2190](https://github.com/cosmos/cosmos-sdk/issues/2190) `gaiacli init --gen-txs` is now `gaiacli init --with-txs` to reduce confusion
-    * [cli] \#2073 --from can now be either an address or a key name
-    * [cli] [\#1184](https://github.com/cosmos/cosmos-sdk/issues/1184) Subcommands reorganisation, see [\#2390](https://github.com/cosmos/cosmos-sdk/pull/2390) for a comprehensive list of changes.
-    * [cli] [\#2524](https://github.com/cosmos/cosmos-sdk/issues/2524) Add support offline mode to `gaiacli tx sign`. Lookups are not performed if the flag `--offline` is on.
-    * [cli] [\#2570](https://github.com/cosmos/cosmos-sdk/pull/2570) Add commands to query deposits on proposals
 
 * Gaia
-    * Make the transient store key use a distinct store key. [#2013](https://github.com/cosmos/cosmos-sdk/pull/2013)
-    * [x/stake] [\#1901](https://github.com/cosmos/cosmos-sdk/issues/1901) Validator type's Owner field renamed to Operator; Validator's GetOwner() renamed accordingly to comply with the SDK's Validator interface.
-    * [docs] [#2001](https://github.com/cosmos/cosmos-sdk/pull/2001) Update slashing spec for slashing period
-    * [x/stake, x/slashing] [#1305](https://github.com/cosmos/cosmos-sdk/issues/1305) - Rename "revoked" to "jailed"
-    * [x/stake] [#1676] Revoked and jailed validators put into the unbonding state
-    * [x/stake] [#1877] Redelegations/unbonding-delegation from unbonding validator have reduced time
-    * [x/slashing] \#1789 Slashing changes for Tendermint validator set offset (NextValSet)
-    * [x/stake] [\#2040](https://github.com/cosmos/cosmos-sdk/issues/2040) Validator
-    operator type has now changed to `sdk.ValAddress`
-    * [x/stake] [\#2221](https://github.com/cosmos/cosmos-sdk/issues/2221) New
-    Bech32 prefixes have been introduced for a validator's consensus address and
-    public key: `cosmosvalcons` and `cosmosvalconspub` respectively. Also, existing Bech32 prefixes have been
-    renamed for accounts and validator operators:
-      * `cosmosaccaddr` / `cosmosaccpub` => `cosmos` / `cosmospub`
-      * `cosmosvaladdr` / `cosmosvalpub` => `cosmosvaloper` / `cosmosvaloperpub`
-    * [x/stake] [#1013] TendermintUpdates now uses transient store
-    * [x/stake] \#2435 Remove empty bytes from the ValidatorPowerRank store key
-    * [x/gov] [#2195] Governance uses BFT Time
-    * [x/gov] \#2256 Removed slashing for governance non-voting validators
-    * [simulation] \#2162 Added back correct supply invariants
-    * [x/slashing] \#2430 Simulate more slashes, check if validator is jailed before jailing
-    * [x/stake] \#2393 Removed `CompleteUnbonding` and `CompleteRedelegation` Msg types, and instead added unbonding/redelegation queues to endblocker
-    * [x/mock/simulation] \#2501 Simulate transactions & invariants for fee distribution, and fix bugs discovered in the process
-      * [x/auth] Simulate random fee payments
-      * [cmd/gaia/app] Simulate non-zero inflation
-      * [x/stake] Call hooks correctly in several cases related to delegation/validator updates
-      * [x/stake] Check full supply invariants, including yet-to-be-withdrawn fees
-      * [x/stake] Remove no-longer-in-use store key
-      * [x/slashing] Call hooks correctly when a validator is slashed
-      * [x/slashing] Truncate withdrawals (unbonding, redelegation) and burn change
-      * [x/mock/simulation] Ensure the simulation cannot set a proposer address of nil
-      * [x/mock/simulation] Add more event logs on begin block / end block for clarity
-      * [x/mock/simulation] Correctly set validator power in abci.RequestBeginBlock
-      * [x/minting] Correctly call stake keeper to track inflated supply
-      * [x/distribution] Sanity check for nonexistent rewards
-      * [x/distribution] Truncate withdrawals and return change to the community pool
-      * [x/distribution] Add sanity checks for incorrect accum / total accum relations
-      * [x/distribution] Correctly calculate total power using Tendermint updates
-      * [x/distribution] Simulate withdrawal transactions
-      * [x/distribution] Fix a bug where the fee pool was not correctly tracked on WithdrawDelegatorRewardsAll
-    * [x/stake] \#1673 Validators are no longer deleted until they can no longer possibly be slashed
-    * [\#1890](https://github.com/cosmos/cosmos-sdk/issues/1890) Start chain with initial state + sequence of transactions
-      * [cli] Rename `gaiad init gentx` to `gaiad gentx`.
-      * [cli] Add `--skip-genesis` flag to `gaiad init` to prevent `genesis.json` generation.
-      * Drop `GenesisTx` in favor of a signed `StdTx` with only one `MsgCreateValidator` message.
-      * [cli] Port `gaiad init` and `gaiad testnet` to work with `StdTx` genesis transactions.
-      * [cli] Add `--moniker` flag to `gaiad init` to override moniker when generating `genesis.json` - i.e. it takes effect when running with the `--with-txs` flag, it is ignored otherwise.
 
 * SDK
-    * [core] \#2219 Update to Tendermint 0.24.0
-      * Validator set updates delayed by one block
-      * BFT timestamp that can safely be used by applications
-      * Fixed maximum block size enforcement
-    * [core] [\#1807](https://github.com/cosmos/cosmos-sdk/issues/1807) Switch from use of rational to decimal
-    * [types] [\#1901](https://github.com/cosmos/cosmos-sdk/issues/1901) Validator interface's GetOwner() renamed to GetOperator()
-    * [x/slashing] [#2122](https://github.com/cosmos/cosmos-sdk/pull/2122) - Implement slashing period
-    * [types] [\#2119](https://github.com/cosmos/cosmos-sdk/issues/2119) Parsed error messages and ABCI log errors to make     them more human readable.
-    * [types] \#2407 MulInt method added to big decimal in order to improve efficiency of slashing
-    * [simulation] Rename TestAndRunTx to Operation [#2153](https://github.com/cosmos/cosmos-sdk/pull/2153)
-    * [simulation] Remove log and testing.TB from Operation and Invariants, in favor of using errors \#2282
-    * [simulation] Remove usage of keys and addrs in the types, in favor of simulation.Account \#2384
-    * [tools] Removed gocyclo [#2211](https://github.com/cosmos/cosmos-sdk/issues/2211)
-    * [baseapp] Remove `SetTxDecoder` in favor of requiring the decoder be set in baseapp initialization. [#1441](https://github.com/cosmos/cosmos-sdk/issues/1441)
-    * [baseapp] [\#1921](https://github.com/cosmos/cosmos-sdk/issues/1921) Add minimumFees field to BaseApp.
-    * [store] Change storeInfo within the root multistore to use tmhash instead of ripemd160 \#2308
-    * [codec] \#2324 All referrences to wire have been renamed to codec. Additionally, wire.NewCodec is now codec.New().
-    * [types] \#2343 Make sdk.Msg have a names field, to facilitate automatic tagging.
-    * [baseapp] \#2366 Automatically add action tags to all messages
-    * [x/auth] \#2377 auth.StdSignMsg -> txbuilder.StdSignMsg
-    * [x/staking] \#2244 staking now holds a consensus-address-index instead of a consensus-pubkey-index
-    * [x/staking] \#2236 more distribution hooks for distribution
-    * [x/stake] \#2394 Split up UpdateValidator into distinct state transitions applied only in EndBlock
-    * [x/slashing] \#2480 Fix signing info handling bugs & faulty slashing
-    * [x/stake] \#2412 Added an unbonding validator queue to EndBlock to automatically update validator.Status when finished Unbonding
-    * [x/stake] \#2500 Block conflicting redelegations until we add an index
-    * [x/params] Global Paramstore refactored
-    * [types] \#2506 sdk.Dec MarshalJSON now marshals as a normal Decimal, with 10 digits of decimal precision
-    * [x/stake] \#2508 Utilize Tendermint power for validator power key
-    * [x/stake] \#2531 Remove all inflation logic
-    * [x/mint] \#2531 Add minting module and inflation logic
-    * [x/auth] [\#2540](https://github.com/cosmos/cosmos-sdk/issues/2540) Rename `AccountMapper` to `AccountKeeper`.
-    * [types] \#2456 Renamed msg.Name() and msg.Type() to msg.Type() and msg.Route() respectively
 
 * Tendermint
-  * Update tendermint version from v0.23.0 to v0.25.0, notable changes
-    * Mempool now won't build too large blocks, or too computationally expensive blocks
-    * Maximum tx sizes and gas are now removed, and are implicitly the blocks maximums
-    * ABCI validators no longer send the pubkey. The pubkey is only sent in validator updates
-    * Validator set changes are now delayed by one block
-    * Block header now includes the next validator sets hash
-    * BFT time is implemented
-    * Secp256k1 signature format has changed
-    * There is now a threshold multisig format
-    * See the [tendermint changelog](https://github.com/tendermint/tendermint/blob/master/CHANGELOG.md) for other changes.
+
 
 FEATURES
 
 * Gaia REST API (`gaiacli advanced rest-server`)
-  * [gaia-lite] Endpoints to query staking pool and params
-  * [gaia-lite] [\#2110](https://github.com/cosmos/cosmos-sdk/issues/2110) Add support for `simulate=true` requests query argument to endpoints that send txs to run simulations of transactions
-  * [gaia-lite] [\#966](https://github.com/cosmos/cosmos-sdk/issues/966) Add support for `generate_only=true` query argument to generate offline unsigned transactions
-  * [gaia-lite] [\#1953](https://github.com/cosmos/cosmos-sdk/issues/1953) Add /sign endpoint to sign transactions generated with `generate_only=true`.
-  * [gaia-lite] [\#1954](https://github.com/cosmos/cosmos-sdk/issues/1954) Add /broadcast endpoint to broadcast transactions signed by the /sign endpoint.
-  * [gaia-lite] [\#2113](https://github.com/cosmos/cosmos-sdk/issues/2113) Rename `/accounts/{address}/send` to `/bank/accounts/{address}/transfers`, rename `/accounts/{address}` to `/auth/accounts/{address}`, replace `proposal-id` with `proposalId` in all gov endpoints
-  * [gaia-lite] [\#2478](https://github.com/cosmos/cosmos-sdk/issues/2478) Add query gov proposal's deposits endpoint
-  * [gaia-lite] [\#2477](https://github.com/cosmos/cosmos-sdk/issues/2477) Add query validator's outgoing redelegations and unbonding delegations endpoints
 
 * Gaia CLI  (`gaiacli`)
-  * [cli] Cmds to query staking pool and params
-  * [gov][cli] #2062 added `--proposal` flag to `submit-proposal` that allows a JSON file containing a proposal to be passed in
-  * [\#2040](https://github.com/cosmos/cosmos-sdk/issues/2040) Add `--bech` to `gaiacli keys show` and respective REST endpoint to
-  provide desired Bech32 prefix encoding
-  * [cli] [\#2047](https://github.com/cosmos/cosmos-sdk/issues/2047) [\#2306](https://github.com/cosmos/cosmos-sdk/pull/2306) Passing --gas=simulate triggers a simulation of the tx before the actual execution.
-  The gas estimate obtained via the simulation will be used as gas limit in the actual execution.
-  * [cli] [\#2047](https://github.com/cosmos/cosmos-sdk/issues/2047) The --gas-adjustment flag can be used to adjust the estimate obtained via the simulation triggered by --gas=simulate.
-  * [cli] [\#2110](https://github.com/cosmos/cosmos-sdk/issues/2110) Add --dry-run flag to perform a simulation of a transaction without broadcasting it. The --gas flag is ignored as gas would be automatically estimated.
-  * [cli] [\#2204](https://github.com/cosmos/cosmos-sdk/issues/2204) Support generating and broadcasting messages with multiple signatures via command line:
-    * [\#966](https://github.com/cosmos/cosmos-sdk/issues/966) Add --generate-only flag to build an unsigned transaction and write it to STDOUT.
-    * [\#1953](https://github.com/cosmos/cosmos-sdk/issues/1953) New `sign` command to sign transactions generated with the --generate-only flag.
-    * [\#1954](https://github.com/cosmos/cosmos-sdk/issues/1954) New `broadcast` command to broadcast transactions generated offline and signed with the `sign` command.
-  * [cli] \#2220 Add `gaiacli config` feature to interactively create CLI config files to reduce the number of required flags
-  * [stake][cli] [\#1672](https://github.com/cosmos/cosmos-sdk/issues/1672) Introduced
-  new commission flags for validator commands `create-validator` and `edit-validator`.
-  * [stake][cli] [\#1890](https://github.com/cosmos/cosmos-sdk/issues/1890) Add `--genesis-format` flag to `gaiacli tx create-validator` to produce transactions in genesis-friendly format.
-  * [cli][\#2554](https://github.com/cosmos/cosmos-sdk/issues/2554) Make `gaiacli keys show` multisig ready.
 
 * Gaia
-  * [cli] #2170 added ability to show the node's address via `gaiad tendermint show-address`
-  * [simulation] #2313 Reworked `make test_sim_gaia_slow` to `make test_sim_gaia_full`, now simulates from multiple starting seeds in parallel
-  * [cli] [\#1921] (https://github.com/cosmos/cosmos-sdk/issues/1921)
-    * New configuration file `gaiad.toml` is now created to host Gaia-specific configuration.
-    * New --minimum_fees/minimum_fees flag/config option to set a minimum fee.
 
 * SDK
-  * [querier] added custom querier functionality, so ABCI query requests can be handled by keepers
-  * [simulation] [\#1924](https://github.com/cosmos/cosmos-sdk/issues/1924) allow operations to specify future operations
-  * [simulation] [\#1924](https://github.com/cosmos/cosmos-sdk/issues/1924) Add benchmarking capabilities, with makefile commands "test_sim_gaia_benchmark, test_sim_gaia_profile"
-  * [simulation] [\#2349](https://github.com/cosmos/cosmos-sdk/issues/2349) Add time-based future scheduled operations to simulator
-  * [x/auth] \#2376 Remove FeePayer() from StdTx
-  * [x/stake] [\#1672](https://github.com/cosmos/cosmos-sdk/issues/1672) Implement
-  basis for the validator commission model.
-  * [x/auth] Support account removal in the account mapper.
 
 * Tendermint
 
 
 IMPROVEMENTS
-* [tools] Improved terraform and ansible scripts for infrastructure deployment
-* [tools] Added ansible script to enable process core dumps
 
 * Gaia REST API (`gaiacli advanced rest-server`)
-    * [x/stake] [\#2000](https://github.com/cosmos/cosmos-sdk/issues/2000) Added tests for new staking endpoints
-    * [gaia-lite] [\#2445](https://github.com/cosmos/cosmos-sdk/issues/2445) Standarized REST error responses
-    * [gaia-lite] Added example to Swagger specification for /keys/seed.
-    * [x/stake] Refactor REST utils
 
 * Gaia CLI  (`gaiacli`)
-    * [cli] #2060 removed `--select` from `block` command
-    * [cli] #2128 fixed segfault when exporting directly after `gaiad init`
-    * [cli] [\#1255](https://github.com/cosmos/cosmos-sdk/issues/1255) open KeyBase in read-only mode
-     for query-purpose CLI commands
 
 * Gaia
-    * [x/stake] [#2023](https://github.com/cosmos/cosmos-sdk/pull/2023) Terminate iteration loop in `UpdateBondedValidators` and `UpdateBondedValidatorsFull` when the first revoked validator is encountered and perform a sanity check.
-    * [x/auth] Signature verification's gas cost now accounts for pubkey type. [#2046](https://github.com/tendermint/tendermint/pull/2046)
-    * [x/stake] [x/slashing] Ensure delegation invariants to jailed validators [#1883](https://github.com/cosmos/cosmos-sdk/issues/1883).
-    * [x/stake] Improve speed of GetValidator, which was shown to be a performance bottleneck. [#2046](https://github.com/tendermint/tendermint/pull/2200)
-    * [x/stake] \#2435 Improve memory efficiency of getting the various store keys
-    * [genesis] \#2229 Ensure that there are no duplicate accounts or validators in the genesis state.
-    * [genesis] \#2450 Validate staking genesis parameters.
-    * Add SDK validation to `config.toml` (namely disabling `create_empty_blocks`) \#1571
-    * \#1941(https://github.com/cosmos/cosmos-sdk/issues/1941) Version is now inferred via `git describe --tags`.
-    * [x/distribution] \#1671 add distribution types and tests
 
 * SDK
-    * [tools] Make get_vendor_deps deletes `.vendor-new` directories, in case scratch files are present.
-    * [spec] Added simple piggy bank distribution spec
-    * [cli] [\#1632](https://github.com/cosmos/cosmos-sdk/issues/1632) Add integration tests to ensure `basecoind init && basecoind` start sequences run successfully for both `democoin` and `basecoin` examples.
-    * [store] Speedup IAVL iteration, and consequently everything that requires IAVL iteration. [#2143](https://github.com/cosmos/cosmos-sdk/issues/2143)
-    * [store] \#1952, \#2281 Update IAVL dependency to v0.11.0
-    * [simulation] Make timestamps randomized [#2153](https://github.com/cosmos/cosmos-sdk/pull/2153)
-    * [simulation] Make logs not just pure strings, speeding it up by a large factor at greater block heights \#2282
-    * [simulation] Add a concept of weighting the operations \#2303
-    * [simulation] Logs get written to file if large, and also get printed on panics \#2285
-    * [simulation] Bank simulations now makes testing auth configurable \#2425
-    * [gaiad] \#1992 Add optional flag to `gaiad testnet` to make config directory of daemon (default `gaiad`) and cli (default `gaiacli`) configurable
-    * [x/stake] Add stake `Queriers` for Gaia-lite endpoints. This increases the staking endpoints performance by reusing the staking `keeper` logic for queries. [#2249](https://github.com/cosmos/cosmos-sdk/pull/2149)
-    * [store] [\#2017](https://github.com/cosmos/cosmos-sdk/issues/2017) Refactor
-    gas iterator gas consumption to only consume gas for iterator creation and `Next`
-    calls which includes dynamic consumption of value length.
-    * [types/decimal] \#2378 - Added truncate functionality to decimal
-    * [client] [\#1184](https://github.com/cosmos/cosmos-sdk/issues/1184) Remove unused `client/tx/sign.go`.
-    * [tools] \#2464 Lock binary dependencies to a specific version
 
 * Tendermint
 
+
 BUG FIXES
 
 * Gaia REST API (`gaiacli advanced rest-server`)
 
 * Gaia CLI  (`gaiacli`)
-    * [cli] [\#1997](https://github.com/cosmos/cosmos-sdk/issues/1997) Handle panics gracefully when `gaiacli stake {delegation,unbond}` fail to unmarshal delegation.
-    * [cli] [\#2265](https://github.com/cosmos/cosmos-sdk/issues/2265) Fix JSON formatting of the `gaiacli send` command.
-    * [cli] [\#2547](https://github.com/cosmos/cosmos-sdk/issues/2547) Mark --to and --amount as required flags for `gaiacli tx send`.
 
 * Gaia
-  * [x/stake] Return correct Tendermint validator update set on `EndBlocker` by not
-  including non previously bonded validators that have zero power. [#2189](https://github.com/cosmos/cosmos-sdk/issues/2189)
 
 * SDK
-    * [\#1988](https://github.com/cosmos/cosmos-sdk/issues/1988) Make us compile on OpenBSD (disable ledger) [#1988] (https://github.com/cosmos/cosmos-sdk/issues/1988)
-    * [\#2105](https://github.com/cosmos/cosmos-sdk/issues/2105) Fix DB Iterator leak, which may leak a go routine.
-    * [ledger] [\#2064](https://github.com/cosmos/cosmos-sdk/issues/2064) Fix inability to sign and send transactions via the LCD by
-    loading a Ledger device at runtime.
-    * [\#2158](https://github.com/cosmos/cosmos-sdk/issues/2158) Fix non-deterministic ordering of validator iteration when slashing in `gov EndBlocker`
-    * [simulation] \#1924 Make simulation stop on SIGTERM
-    * [\#2388](https://github.com/cosmos/cosmos-sdk/issues/2388) Remove dependency on deprecated tendermint/tmlibs repository.
-    * [\#2416](https://github.com/cosmos/cosmos-sdk/issues/2416) Refactored
-    `InitializeTestLCD` to properly include proposing validator in genesis state.
 
 * Tendermint
diff --git a/client/keys/new.go b/client/keys/new.go
index 3408eb9d0061..e72a958a928a 100644
--- a/client/keys/new.go
+++ b/client/keys/new.go
@@ -1,9 +1,7 @@
 package keys
 
 import (
-	"bufio"
 	"fmt"
-	"os"
 
 	"github.com/bartekn/go-bip39"
 	"github.com/pkg/errors"
@@ -46,15 +44,15 @@ input
 output
 	- armor encrypted private key (saved to file)
 */
-// nolint: gocyclo
 func runNewCmd(cmd *cobra.Command, args []string) error {
 	name := args[0]
-	kb, err := GetKeyBase()
+	kb, err := GetKeyBaseWithWritePerm()
 	if err != nil {
 		return err
 	}
 
 	buf := client.BufferStdin()
+
 	_, err = kb.Get(name)
 	if err == nil {
 		// account exists, ask for user confirmation
@@ -73,24 +71,25 @@ func runNewCmd(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	// if we're using ledger, only thing we need is the path.
-	// generate key and we're done.
+	// If we're using ledger, only thing we need is the path. So generate key and
+	// we're done.
 	if viper.GetBool(client.FlagUseLedger) {
-
-		algo := keys.Secp256k1               // SigningAlgo(viper.GetString(flagType))
+		algo := keys.Secp256k1
 		path := bip44Params.DerivationPath() // ccrypto.DerivationPath{44, 118, account, 0, index}
+
 		info, err := kb.CreateLedger(name, path, algo)
 		if err != nil {
 			return err
 		}
+
 		printCreate(info, "")
 		return nil
 	}
 
-	// get the mnemonic
 	var mnemonic string
+
 	if !useDefaults {
-		mnemonic, err = client.GetString("> Enter your bip39 mnemonic, or hit enter to generate one.", buf)
+		mnemonic, err = client.GetString("Enter your bip39 mnemonic, or hit enter to generate one.", buf)
 		if err != nil {
 			return err
 		}
@@ -102,6 +101,7 @@ func runNewCmd(cmd *cobra.Command, args []string) error {
 		if err != nil {
 			return err
 		}
+
 		mnemonic, err = bip39.NewMnemonic(entropySeed[:])
 		if err != nil {
 			return err
@@ -113,7 +113,8 @@ func runNewCmd(cmd *cobra.Command, args []string) error {
 	if !useDefaults {
 		printStep()
 		printPrefixed("Enter your bip39 passphrase. This is combined with the mnemonic to derive the seed")
-		bip39Passphrase, err = client.GetString("> Most users should just hit enter to use the default, \"\"", buf)
+
+		bip39Passphrase, err = client.GetString("Most users should just hit enter to use the default, \"\"", buf)
 		if err != nil {
 			return err
 		}
@@ -124,14 +125,16 @@ func runNewCmd(cmd *cobra.Command, args []string) error {
 			if err != nil {
 				return err
 			}
+
 			if bip39Passphrase != p2 {
 				return errors.New("passphrases don't match")
 			}
 		}
 	}
 
-	// get the encryption password
 	printStep()
+
+	// get the encryption password
 	encryptPassword, err := client.GetCheckPassword(
 		"> Enter a passphrase to encrypt your key to disk:",
 		"> Repeat the passphrase:", buf)
@@ -143,24 +146,26 @@ func runNewCmd(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	_ = info
 
+	_ = info
 	return nil
 }
 
 func getBIP44ParamsAndPath(path string, flagSet bool) (*hd.BIP44Params, error) {
-	buf := bufio.NewReader(os.Stdin)
+	buf := client.BufferStdin()
 	bip44Path := path
 
-	// if it wasnt set in the flag, give it a chance to overide interactively
+	// if it wasn't set in the flag, give it a chance to overide interactively
 	if !flagSet {
+		var err error
+
 		printStep()
 
-		var err error
-		bip44Path, err = client.GetString(fmt.Sprintf("> Enter your bip44 path. Default is %s\n", path), buf)
+		bip44Path, err = client.GetString(fmt.Sprintf("Enter your bip44 path. Default is %s\n", path), buf)
 		if err != nil {
 			return nil, err
 		}
+
 		if len(bip44Path) == 0 {
 			bip44Path = path
 		}
@@ -170,6 +175,7 @@ func getBIP44ParamsAndPath(path string, flagSet bool) (*hd.BIP44Params, error) {
 	if err != nil {
 		return nil, err
 	}
+
 	return bip44params, nil
 }
 
diff --git a/client/keys/show.go b/client/keys/show.go
index 89b2f1b39de6..3b574544b5ac 100644
--- a/client/keys/show.go
+++ b/client/keys/show.go
@@ -6,6 +6,7 @@ import (
 	"github.com/tendermint/tendermint/crypto"
 	"net/http"
 
+	"github.com/cosmos/cosmos-sdk/crypto/keys/keyerror"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/gorilla/mux"
 	"github.com/pkg/errors"
@@ -13,7 +14,6 @@ import (
 	"github.com/spf13/viper"
 	"github.com/tendermint/tendermint/crypto/multisig"
 	"github.com/tendermint/tendermint/libs/cli"
-	"github.com/cosmos/cosmos-sdk/crypto/keys/keyerror"
 )
 
 const (
diff --git a/client/keys/update.go b/client/keys/update.go
index 5f4c92e6f624..2489bce128bc 100644
--- a/client/keys/update.go
+++ b/client/keys/update.go
@@ -9,8 +9,8 @@ import (
 	keys "github.com/cosmos/cosmos-sdk/crypto/keys"
 	"github.com/gorilla/mux"
 
-	"github.com/spf13/cobra"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/keyerror"
+	"github.com/spf13/cobra"
 )
 
 func updateKeyCommand() *cobra.Command {
diff --git a/client/keys/utils.go b/client/keys/utils.go
index 522015e1b458..8a7eefea38f6 100644
--- a/client/keys/utils.go
+++ b/client/keys/utils.go
@@ -77,7 +77,7 @@ func ReadPassphraseFromStdin(name string) (string, error) {
 
 // TODO make keybase take a database not load from the directory
 
-// GetKeyBase initializes a read-only KeyBase based on the configuration. 
+// GetKeyBase initializes a read-only KeyBase based on the configuration.
 func GetKeyBase() (keys.Keybase, error) {
 	rootDir := viper.GetString(cli.HomeFlag)
 	return GetKeyBaseFromDir(rootDir)
diff --git a/client/keys/utils_test.go b/client/keys/utils_test.go
index 39ca634289b6..6b65bb55a529 100644
--- a/client/keys/utils_test.go
+++ b/client/keys/utils_test.go
@@ -16,7 +16,7 @@ func TestGetKeyBaseLocks(t *testing.T) {
 	// Acquire db
 	kb, err := GetKeyBaseFromDirWithWritePerm(dir)
 	require.Nil(t, err)
-	_, _,  err = kb.CreateMnemonic("foo", keys.English, "12345678", keys.Secp256k1)
+	_, _, err = kb.CreateMnemonic("foo", keys.English, "12345678", keys.Secp256k1)
 	require.Nil(t, err)
 	// Reset global variable
 	keybase = nil
diff --git a/crypto/keys/keybase.go b/crypto/keys/keybase.go
index ad43bfd9f4ab..86ae5c157165 100644
--- a/crypto/keys/keybase.go
+++ b/crypto/keys/keybase.go
@@ -15,11 +15,11 @@ import (
 	"github.com/cosmos/cosmos-sdk/crypto/keys/mintkey"
 	"github.com/cosmos/cosmos-sdk/types"
 
+	"github.com/cosmos/cosmos-sdk/crypto/keys/keyerror"
 	tmcrypto "github.com/tendermint/tendermint/crypto"
 	"github.com/tendermint/tendermint/crypto/encoding/amino"
 	"github.com/tendermint/tendermint/crypto/secp256k1"
 	dbm "github.com/tendermint/tendermint/libs/db"
-	"github.com/cosmos/cosmos-sdk/crypto/keys/keyerror"
 )
 
 var _ Keybase = dbKeybase{}
diff --git a/crypto/keys/mintkey/mintkey.go b/crypto/keys/mintkey/mintkey.go
index 20a183f33074..35cb9ccabf6a 100644
--- a/crypto/keys/mintkey/mintkey.go
+++ b/crypto/keys/mintkey/mintkey.go
@@ -11,8 +11,8 @@ import (
 	"github.com/tendermint/tendermint/crypto/encoding/amino"
 	"github.com/tendermint/tendermint/crypto/xsalsa20symmetric"
 
-	cmn "github.com/tendermint/tendermint/libs/common"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/keyerror"
+	cmn "github.com/tendermint/tendermint/libs/common"
 )
 
 const (
diff --git a/docs/config.js b/docs/config.js
new file mode 100644
index 000000000000..93426bcc5f88
--- /dev/null
+++ b/docs/config.js
@@ -0,0 +1,86 @@
+module.exports = {
+  title: "Cosmos Network",
+  description: "Documentation for the Cosmos Network.",
+  dest: "./dist/docs",
+  base: "/docs/",
+  markdown: {
+    lineNumbers: true
+  },
+  themeConfig: {
+    lastUpdated: "Last Updated",
+    nav: [{ text: "Back to Cosmos", link: "https://cosmos.network" }],
+    sidebar: [
+      {
+        title: "Introduction",
+        collapsable: false,
+        children: [
+          "/introduction/cosmos-hub",
+          "/introduction/tendermint",
+        ]
+      },
+      {
+        title: "Getting Started",
+        collapsable: false,
+        children: [
+          "/getting-started/voyager",
+          "/getting-started/installation",
+          "/getting-started/full-node",
+          "/getting-started/create-testnet"
+        ]
+      },
+      {
+        title: "Cosmos SDK",
+        collapsable: false,
+        children: [
+          ["/sdk/overview", "Overview"],
+          ["/sdk/core/intro", "Core"],
+          "/sdk/core/app1",
+          "/sdk/core/app2",
+          "/sdk/core/app3",
+          "/sdk/core/app4",
+          "/sdk/core/app5",
+          // "/sdk/modules",
+          "/sdk/clients"
+        ]
+      },
+      // {
+      //   title: "Specifications",
+      //   collapsable: false,
+      //   children: [
+      //     ["/specs/overview", "Overview"],
+      //     "/specs/governance",
+      //     "/specs/ibc",
+      //     "/specs/staking",
+      //     "/specs/icts",
+      //   ]
+      // },
+      {
+        title: "Lotion JS",
+        collapsable: false,
+        children: [["/lotion/overview", "Overview"], "/lotion/building-an-app"]
+      },
+      {
+        title: "Validators",
+        collapsable: false,
+        children: [
+          ["/validators/overview", "Overview"],
+          ["/validators/security", "Security"],
+          ["/validators/validator-setup", "Validator Setup"],
+          "/validators/validator-faq"
+        ]
+      },
+      {
+        title: "Resources",
+        collapsable: false,
+        children: [
+          // ["/resources/faq" "General"],
+          "/resources/delegator-faq",
+          ["/resources/whitepaper", "Whitepaper - English"],
+          ["/resources/whitepaper-ko", "Whitepaper - 한국어"],
+          ["/resources/whitepaper-zh-CN", "Whitepaper - 中文"],
+          ["/resources/whitepaper-pt", "Whitepaper - Português"]
+        ]
+      }
+    ]
+  }
+}
diff --git a/x/auth/client/rest/sign.go b/x/auth/client/rest/sign.go
index 4a257ff6c666..13dd8d20c306 100644
--- a/x/auth/client/rest/sign.go
+++ b/x/auth/client/rest/sign.go
@@ -7,9 +7,9 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/context"
 	"github.com/cosmos/cosmos-sdk/client/utils"
 	"github.com/cosmos/cosmos-sdk/codec"
+	"github.com/cosmos/cosmos-sdk/crypto/keys/keyerror"
 	"github.com/cosmos/cosmos-sdk/x/auth"
 	authtxb "github.com/cosmos/cosmos-sdk/x/auth/client/txbuilder"
-	"github.com/cosmos/cosmos-sdk/crypto/keys/keyerror"
 )
 
 // SignBody defines the properties of a sign request's body.
diff --git a/x/distribution/keeper/allocation.go b/x/distribution/keeper/allocation.go
index ddb351e4ed3f..294c273930ff 100644
--- a/x/distribution/keeper/allocation.go
+++ b/x/distribution/keeper/allocation.go
@@ -1,15 +1,12 @@
 package keeper
 
 import (
-	"fmt"
-
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/distribution/types"
 )
 
 // Allocate fees handles distribution of the collected fees
 func (k Keeper) AllocateTokens(ctx sdk.Context, percentVotes sdk.Dec, proposer sdk.ConsAddress) {
-	ctx.Logger().With("module", "x/distribution").Error(fmt.Sprintf("allocation height: %v", ctx.BlockHeight()))
 
 	// get the proposer of this block
 	proposerValidator := k.stakeKeeper.ValidatorByConsAddr(ctx, proposer)
diff --git a/x/distribution/keeper/hooks.go b/x/distribution/keeper/hooks.go
index 10ef25a195de..2f9b5ee54882 100644
--- a/x/distribution/keeper/hooks.go
+++ b/x/distribution/keeper/hooks.go
@@ -1,8 +1,6 @@
 package keeper
 
 import (
-	"fmt"
-
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/distribution/types"
 )
@@ -48,7 +46,6 @@ func (k Keeper) onDelegationCreated(ctx sdk.Context, delAddr sdk.AccAddress,
 		WithdrawalHeight: ctx.BlockHeight(),
 	}
 	k.SetDelegationDistInfo(ctx, ddi)
-	ctx.Logger().With("module", "x/distribution").Error(fmt.Sprintf("ddi created: %v", ddi))
 }
 
 // Withdrawal all validator rewards
diff --git a/x/gov/client/cli/tx.go b/x/gov/client/cli/tx.go
index eebcda882faf..4b23002bd74f 100644
--- a/x/gov/client/cli/tx.go
+++ b/x/gov/client/cli/tx.go
@@ -15,9 +15,9 @@ import (
 	"io/ioutil"
 	"strings"
 
+	"github.com/cosmos/cosmos-sdk/x/gov/client"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"github.com/cosmos/cosmos-sdk/x/gov/client"
 )
 
 const (
diff --git a/x/gov/client/rest/rest.go b/x/gov/client/rest/rest.go
index 882dcf0e1b55..374f5cc2ac56 100644
--- a/x/gov/client/rest/rest.go
+++ b/x/gov/client/rest/rest.go
@@ -10,9 +10,9 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/gov"
 
+	"github.com/cosmos/cosmos-sdk/x/gov/client"
 	"github.com/gorilla/mux"
 	"github.com/pkg/errors"
-	"github.com/cosmos/cosmos-sdk/x/gov/client"
 )
 
 // REST Variable names
@@ -41,12 +41,12 @@ func RegisterRoutes(cliCtx context.CLIContext, r *mux.Router, cdc *codec.Codec)
 }
 
 type postProposalReq struct {
-	BaseReq        utils.BaseReq    `json:"base_req"`
-	Title          string           `json:"title"`           //  Title of the proposal
-	Description    string           `json:"description"`     //  Description of the proposal
-	ProposalType   string			`json:"proposal_type"`   //  Type of proposal. Initial set {PlainTextProposal, SoftwareUpgradeProposal}
-	Proposer       sdk.AccAddress   `json:"proposer"`        //  Address of the proposer
-	InitialDeposit sdk.Coins        `json:"initial_deposit"` // Coins to add to the proposal's deposit
+	BaseReq        utils.BaseReq  `json:"base_req"`
+	Title          string         `json:"title"`           //  Title of the proposal
+	Description    string         `json:"description"`     //  Description of the proposal
+	ProposalType   string         `json:"proposal_type"`   //  Type of proposal. Initial set {PlainTextProposal, SoftwareUpgradeProposal}
+	Proposer       sdk.AccAddress `json:"proposer"`        //  Address of the proposer
+	InitialDeposit sdk.Coins      `json:"initial_deposit"` // Coins to add to the proposal's deposit
 }
 
 type depositReq struct {
@@ -58,7 +58,7 @@ type depositReq struct {
 type voteReq struct {
 	BaseReq utils.BaseReq  `json:"base_req"`
 	Voter   sdk.AccAddress `json:"voter"`  //  address of the voter
-	Option  string		   `json:"option"` //  option from OptionSet chosen by the voter
+	Option  string         `json:"option"` //  option from OptionSet chosen by the voter
 }
 
 func postProposalHandlerFn(cdc *codec.Codec, cliCtx context.CLIContext) http.HandlerFunc {
diff --git a/x/gov/client/utils.go b/x/gov/client/utils.go
index 8dcde5c62e97..013f3944a310 100644
--- a/x/gov/client/utils.go
+++ b/x/gov/client/utils.go
@@ -42,4 +42,3 @@ func NormalizeProposalStatus(status string) string {
 	}
 	return ""
 }
-
diff --git a/x/slashing/client/rest/query.go b/x/slashing/client/rest/query.go
index 8beab13adfbf..99db0df63b54 100644
--- a/x/slashing/client/rest/query.go
+++ b/x/slashing/client/rest/query.go
@@ -4,11 +4,11 @@ import (
 	"net/http"
 
 	"github.com/cosmos/cosmos-sdk/client/context"
+	"github.com/cosmos/cosmos-sdk/client/utils"
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/slashing"
 	"github.com/gorilla/mux"
-	"github.com/cosmos/cosmos-sdk/client/utils"
 )
 
 func registerQueryRoutes(cliCtx context.CLIContext, r *mux.Router, cdc *codec.Codec) {
diff --git a/x/slashing/client/rest/tx.go b/x/slashing/client/rest/tx.go
index 3059fe4c35f8..5f33a1210cb3 100644
--- a/x/slashing/client/rest/tx.go
+++ b/x/slashing/client/rest/tx.go
@@ -23,7 +23,7 @@ func registerTxRoutes(cliCtx context.CLIContext, r *mux.Router, cdc *codec.Codec
 
 // Unjail TX body
 type UnjailReq struct {
-	BaseReq       utils.BaseReq `json:"base_req"`
+	BaseReq utils.BaseReq `json:"base_req"`
 }
 
 func unjailRequestHandlerFn(cdc *codec.Codec, kb keys.Keybase, cliCtx context.CLIContext) http.HandlerFunc {