diff --git a/modules/docker.py b/modules/docker.py
index 77a672d..2a05d73 100644
--- a/modules/docker.py
+++ b/modules/docker.py
@@ -99,6 +99,11 @@ def generate():
 
         logger.debug("upload_msg    : %s" % upload_msg)
 
+        import pprint
+        pp = pprint.PrettyPrinter(indent=4)
+        print "context:\n"
+        pp.pprint(context)
+
     else:
 
         config_src = configuration.templates.docker.database.src
@@ -170,7 +175,10 @@ def start(create=False):
     docker_start = 'docker start %s' % \
         configuration.docker.database.container_name
 
-    docker_run(docker_start)
+    if env.debug:
+        print "docker_run(%s)" % docker_start
+    else:
+        docker_run(docker_start)
 
 
 @task
@@ -193,7 +201,12 @@ def stop(remove=False):
 
     docker_rm = 'docker rm %s' % configuration.docker.database.container_name
 
-    docker_run(docker_stop)
+    if env.debug:
+        print "docker_run(%s)" % docker_stop
+        print "docker_run(%s)" % docker_rm
 
-    if remove:
-        docker_run(docker_rm)
+    else:
+        docker_run(docker_stop)
+
+        if remove:
+            docker_run(docker_rm)