diff --git a/bin/cli b/bin/cli
index 2042647..eddf1df 100755
--- a/bin/cli
+++ b/bin/cli
@@ -72,23 +72,22 @@ program
   });
 
 program
-  .command('migrate <to>')
+  .command('migrate [to]')
   .alias('up')
   .description('Migrate to the given migration')
   .action(function(to, options){
-    console.log('Migrating up to: "%s"', to);
+    console.log('Migrating up to: "%s"', to || 'all');
     var server = program.server || process.cwd() + '/server/server.js';
     var app = require(path.resolve(process.cwd(), server));
     app.models.Migration.migrate('up', to)
     .then(function (res) {
       console.log('Done.');
+      process.exit();
     })
     .catch(function (err) {
       console.log(err);
-    })
-    .finally(function () {
       process.exit();
-    });
+    })
   }).on('--help', function() {
     console.log('  Examples:');
     console.log();
@@ -98,23 +97,22 @@ program
   });
 
 program
-  .command('rollback <to>')
+  .command('rollback [to]')
   .alias('down')
   .description('Rollback to the given migration')
   .action(function(to, options){
-    console.log('Rolling back to: "%s"', to);
+    console.log('Rolling back to: "%s"', to || 'all');
     var server = program.server || process.cwd() + '/server/server.js';
     var app = require(path.resolve(process.cwd(), server));
     app.models.Migration.migrate('down', to)
     .then(function (res) {
       console.log('Done.');
+      process.exit();
     })
     .catch(function (err) {
       console.log(err);
-    })
-    .finally(function () {
       process.exit();
-    });
+    })
   }).on('--help', function() {
     console.log('  Examples:');
     console.log();
diff --git a/lib/models/migration.json b/lib/models/migration.json
index bcb9524..ec1e950 100644
--- a/lib/models/migration.json
+++ b/lib/models/migration.json
@@ -17,7 +17,9 @@
   },
   "indexes": {
     "name_index": {
-      "name": 1
+      "keys": {
+        "name": 1
+      }
     }
   },
   "methods": {