diff --git a/mbx b/mbx
index 05800ab..9410288 100755
--- a/mbx
+++ b/mbx
@@ -708,20 +708,54 @@ destroy() {
   sudo rm -fr /export/testing/$env
 }
 
-case "$1" in
-    help) usage;;
-    -h) usage;;
-    init) init;;
-    list) list;;
-    package) package ${@:2};;
-    deploy) deploy ${@:2};;
-    launch) launch $2;;
-    test) test;;
-    dev) dev ${@:2};;
-    agentscp) agentscp ${@:2};;
-    ssh) issh root@$2;;
-    start) start $2;;
-    stop) stop $2;;
-    destroy) destroy $2;;
-    *) usage;;
+command=$1
+shift
+
+case "$command" in
+    help) usage
+          ;;
+    init)
+        init
+        ;;
+    list)
+        list
+        ;;
+    package)
+        package "$@"
+        # ${@:2}
+        ;;
+    deploy)
+        deploy "$@"
+        # ${@:2}
+        ;;
+    launch)
+        launch "$1"
+        ;;
+    test)
+        test
+        ;;
+    dev)
+        dev "$@"
+        # ${@:2}
+        ;;
+    agentscp)
+        agentscp "$@"
+        # ${@:2}
+        ;;
+    ssh)
+        issh "root@$1"
+        # root@$2
+        ;;
+    start)
+        start "$1"
+        ;;
+    stop)
+        stop "$1"
+        ;;
+    destroy)
+        destroy "$1"
+        ;;
+    *)
+        usage
+        ;;
 esac