diff --git a/fluents b/fluents
index ac42eef..d9d7fed 100755
--- a/fluents
+++ b/fluents
@@ -31,11 +31,9 @@ def list_workflows():
     print 'Workflows:'
 
     wfs = workflow.workflow_list()
-    names = [wf.name for wf in wfs]
-    names.sort()
-
-    for n in names:
-        print '    %s (%s)' % (n.id, n.name)
+    for wf in wfs:
+        print '    %s (%s)' % (wf.ident, wf.name)
+    print
 
 def parse_options():
     short_opts = 'hlw:'
@@ -46,8 +44,10 @@ def parse_options():
     for opt, val in options:
         if opt in ['-h', '--help']:
             show_help()
+            sys.exit(0)
         elif opt in ['-l', '--list-workflows']:
             list_workflows()
+            sys.exit(0)
         elif opt in ['-w', '--workflow']:
             wfs = workflow.workflow_list()
             for wf in wfs: