diff --git a/src/cli/commands/bootstrap/add.js b/src/cli/commands/bootstrap/add.js
index 188198e438..f891438534 100644
--- a/src/cli/commands/bootstrap/add.js
+++ b/src/cli/commands/bootstrap/add.js
@@ -3,11 +3,11 @@
 const Command = require('ronin').Command
 const IPFS = require('../../../ipfs-core')
 const debug = require('debug')
-const log = debug('cli:version')
-log.error = debug('cli:version:error')
+const log = debug('cli:bootstrap')
+log.error = debug('cli:bootstrap:error')
 
 module.exports = Command.extend({
-  desc: 'Show peers in the bootstrap list',
+  desc: 'Add peers to the bootstrap list',
 
   options: {},
 
diff --git a/src/cli/commands/bootstrap/list.js b/src/cli/commands/bootstrap/list.js
index f0fa7e5c79..9ca2f1e238 100644
--- a/src/cli/commands/bootstrap/list.js
+++ b/src/cli/commands/bootstrap/list.js
@@ -3,8 +3,8 @@
 const Command = require('ronin').Command
 const IPFS = require('../../../ipfs-core')
 const debug = require('debug')
-const log = debug('cli:version')
-log.error = debug('cli:version:error')
+const log = debug('cli:bootstrap')
+log.error = debug('cli:bootstrap:error')
 
 module.exports = Command.extend({
   desc: 'Show peers in the bootstrap list',
diff --git a/src/cli/commands/bootstrap/rm.js b/src/cli/commands/bootstrap/rm.js
index a3bca1059c..06bd38e935 100644
--- a/src/cli/commands/bootstrap/rm.js
+++ b/src/cli/commands/bootstrap/rm.js
@@ -3,11 +3,11 @@
 const Command = require('ronin').Command
 const IPFS = require('../../../ipfs-core')
 const debug = require('debug')
-const log = debug('cli:version')
-log.error = debug('cli:version:error')
+const log = debug('cli:bootstrap')
+log.error = debug('cli:bootstrap:error')
 
 module.exports = Command.extend({
-  desc: 'Show peers in the bootstrap list',
+  desc: 'Removes peers from the bootstrap list',
 
   options: {},
 
diff --git a/src/cli/commands/commands.js b/src/cli/commands/commands.js
index a8ab673e83..86bf059b73 100644
--- a/src/cli/commands/commands.js
+++ b/src/cli/commands/commands.js
@@ -5,7 +5,7 @@ const path = require('path')
 const ronin = require('ronin')
 
 module.exports = Command.extend({
-  desc: '',
+  desc: 'List all available commands',
 
   run: (name) => {
     const cli = ronin(path.resolve(__dirname, '..'))
diff --git a/src/cli/commands/config.js b/src/cli/commands/config.js
index 22c6b788a3..71b8e042a4 100644
--- a/src/cli/commands/config.js
+++ b/src/cli/commands/config.js
@@ -9,7 +9,7 @@ const log = debug('cli:config')
 log.error = debug('cli:config:error')
 
 module.exports = Command.extend({
-  desc: 'Controls configuration variables.',
+  desc: 'Get and set IPFS config values',
 
   options: {
     bool: {
diff --git a/src/cli/commands/config/edit.js b/src/cli/commands/config/edit.js
index 60087383eb..fd7e5f1d98 100644
--- a/src/cli/commands/config/edit.js
+++ b/src/cli/commands/config/edit.js
@@ -7,8 +7,8 @@ const temp = require('temp')
 const async = require('async')
 const IPFS = require('../../../ipfs-core')
 const debug = require('debug')
-const log = debug('cli:version')
-log.error = debug('cli:version:error')
+const log = debug('cli:config')
+log.error = debug('cli:config:error')
 
 module.exports = Command.extend({
   desc: 'Opens the config file for editing in $EDITOR',
diff --git a/src/cli/commands/config/replace.js b/src/cli/commands/config/replace.js
index d2b94d096a..0279714acb 100644
--- a/src/cli/commands/config/replace.js
+++ b/src/cli/commands/config/replace.js
@@ -4,8 +4,8 @@ const Command = require('ronin').Command
 const IPFS = require('../../../ipfs-core')
 const debug = require('debug')
 const path = require('path')
-const log = debug('cli:version')
-log.error = debug('cli:version:error')
+const log = debug('cli:config')
+log.error = debug('cli:config:error')
 
 module.exports = Command.extend({
   desc: 'Replaces the config with <file>',
diff --git a/src/cli/commands/config/show.js b/src/cli/commands/config/show.js
index f5cb923cdf..27425530b9 100644
--- a/src/cli/commands/config/show.js
+++ b/src/cli/commands/config/show.js
@@ -3,8 +3,8 @@
 const Command = require('ronin').Command
 const IPFS = require('../../../ipfs-core')
 const debug = require('debug')
-const log = debug('cli:version')
-log.error = debug('cli:version:error')
+const log = debug('cli:config')
+log.error = debug('cli:config:error')
 
 module.exports = Command.extend({
   desc: 'Outputs the content of the config file',
diff --git a/tests/test-http-api/test-config.js b/tests/test-http-api/test-config.js
index 05a5430eae..d7389f58c9 100644
--- a/tests/test-http-api/test-config.js
+++ b/tests/test-http-api/test-config.js
@@ -154,13 +154,13 @@ describe('config', () => {
         const form = new FormData()
         const headers = form.getHeaders()
 
-        streamToPromise(form).then(payload => {
+        streamToPromise(form).then((payload) => {
           api.inject({
             method: 'POST',
             url: '/api/v0/config/replace',
             headers: headers,
             payload: payload
-          }, res => {
+          }, (res) => {
             expect(res.statusCode).to.equal(400)
             done()
           })
@@ -173,13 +173,13 @@ describe('config', () => {
         form.append('file', fs.createReadStream(filePath))
         const headers = form.getHeaders()
 
-        streamToPromise(form).then(payload => {
+        streamToPromise(form).then((payload) => {
           api.inject({
             method: 'POST',
             url: '/api/v0/config/replace',
             headers: headers,
             payload: payload
-          }, res => {
+          }, (res) => {
             expect(res.statusCode).to.equal(500)
             done()
           })
@@ -193,13 +193,13 @@ describe('config', () => {
         const headers = form.getHeaders()
         const expectedConfig = JSON.parse(fs.readFileSync(filePath, 'utf8'))
 
-        streamToPromise(form).then(payload => {
+        streamToPromise(form).then((payload) => {
           api.inject({
             method: 'POST',
             url: '/api/v0/config/replace',
             headers: headers,
             payload: payload
-          }, res => {
+          }, (res) => {
             expect(res.statusCode).to.equal(200)
             expect(updatedConfig()).to.deep.equal(expectedConfig)
             done()