diff --git a/bin/umbra b/bin/umbra
index dc8decd..06a2f32 100755
--- a/bin/umbra
+++ b/bin/umbra
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # vim: set sw=4 et:
- 
+
 import logging
 import argparse
 import time
@@ -11,15 +11,11 @@ import os
 import umbra.controller
 
 if __name__=="__main__":
-    # logging.basicConfig(stream=sys.stdout, level=logging.INFO,
-    logging.basicConfig(stream=sys.stdout, level=logging.DEBUG,
-            format='%(asctime)s %(process)d %(levelname)s %(threadName)s %(name)s.%(funcName)s(%(filename)s:%(lineno)d) %(message)s')
-
     import faulthandler
     faulthandler.register(signal.SIGQUIT)
 
     arg_parser = argparse.ArgumentParser(prog=os.path.basename(sys.argv[0]),
-            description='umbra - Browser automation tool',
+            description='umbra - browser automation tool communicating via AMQP',
             formatter_class=argparse.ArgumentDefaultsHelpFormatter)
     arg_parser.add_argument('-w', '--browser-wait', dest='browser_wait', default='60',
             help='Seconds to wait for browser initialization')
@@ -27,13 +23,27 @@ if __name__=="__main__":
             help='Executable to use to invoke chrome')
     arg_parser.add_argument('-u', '--url', dest='amqp_url', default='amqp://guest:guest@localhost:5672/%2f',
             help='URL identifying the amqp server to talk to')
+    arg_parser.add_argument('--exchange', dest='amqp_exchange', default='umbra',
+            help='AMQP exchange name')
+    arg_parser.add_argument('--queue', dest='amqp_queue', default='urls',
+            help='AMQP queue to consume urls from')
+    arg_parser.add_argument('--routing-key', dest='amqp_routing_key', default='url',
+            help='AMQP routing key to bind to the AMQP queue')
     arg_parser.add_argument('-n', '--max-browsers', dest='max_browsers', default='3',
             help='Max number of chrome instances simultaneously browsing pages')
+    arg_parser.add_argument('-v', '--verbose', dest='log_level',
+            action="store_const", default=logging.INFO, const=logging.DEBUG)
     args = arg_parser.parse_args(args=sys.argv[1:])
 
+    logging.basicConfig(stream=sys.stdout, level=args.log_level,
+            format='%(asctime)s %(process)d %(levelname)s %(threadName)s %(name)s.%(funcName)s(%(filename)s:%(lineno)d) %(message)s')
+
     controller = umbra.controller.AmqpBrowserController(args.amqp_url,
-		    args.chrome_exe, args.browser_wait,
-		    max_active_browsers=int(args.max_browsers))
+            args.chrome_exe, args.browser_wait,
+            max_active_browsers=int(args.max_browsers),
+            exchange_name=args.amqp_exchange, queue_name=args.amqp_queue,
+            routing_key=args.amqp_routing_key)
+
     try:
         while True:
             time.sleep(0.5)