diff --git a/Docs/Tools/csvGrapher.py b/Docs/Tools/csvGrapher.py
index 7a8f27203..f4c090c03 100644
--- a/Docs/Tools/csvGrapher.py
+++ b/Docs/Tools/csvGrapher.py
@@ -117,6 +117,7 @@ def cumulative_users(stats):
 
 
 def pyplot_init():
+    pyplot.close('all')
     pyplot.figure(figsize=(14, 8), dpi=200)
     pyplot.xticks(rotation='vertical')
     pyplot.grid()
@@ -258,7 +259,7 @@ def cumulative_changes_per(contents, index, subject, filenameextra="", cutoff=5,
             edits_per_day_cumul = themes.map(lambda themes_for_date: len([x for x in themes_for_date if theme == x]))
 
         if (not cumulative) or (running_totals is None):
-            running_totals = edits_per_day_cumul
+             running_totals = edits_per_day_cumul
         else:
             running_totals = list(map(lambda ab: ab[0] + ab[1], zip(running_totals, edits_per_day_cumul)))
 
@@ -289,7 +290,7 @@ def cumulative_changes_per(contents, index, subject, filenameextra="", cutoff=5,
         if cumulative:
             pyplot.fill_between(keys, kv[1], label=msg)
         else:
-            pyplot.plot(keys, kv[1], label=msg)
+            pyplot.bar(keys, kv[1], label=msg)
 
     if cumulative:
         cumulative_txt = "Cumulative changesets"
@@ -412,6 +413,8 @@ def clean_input(contents):
             theme = row[7][i + 1:-1].lower()
         if theme in theme_remappings:
             theme = theme_remappings[theme]
+        if theme.rfind('/') > 0:
+            theme = theme[theme.rfind('/') + 1 : ]
         row[3] = theme
         row[4] = row[4].strip().strip("\"")[len("MapComplete "):]
         row[4] = re.findall("[0-9]*\.[0-9]*\.[0-9]*", row[4])[0]