diff --git a/environment.yaml b/environment.yaml
index f05599979991842e8a3b75a6e46a929e893f66f1..fa70090c9ee2df23f9dd127d77a1781a7981be86 100644
--- a/environment.yaml
+++ b/environment.yaml
@@ -4,9 +4,11 @@ channels:
     - cpape
     - conda-forge
 dependencies:
+    - affogato
     - scikit-image
     - luigi
     - nifty
     - vigra
     - h5py
     - z5py
+    - cluster_tools
diff --git a/master.py b/master.py
index 0584728505e12bc85ab4b485c792ac21cd955478..a0be25409fba56b3184c2e5dbfdf765e0fddc5ce 100644
--- a/master.py
+++ b/master.py
@@ -17,8 +17,10 @@ def get_tags():
 
 # TODO do we need more sub-folders ?
 def make_folder_structure(tag):
-    new_tables_folder = os.path.join('data', tag, 'tables')
+    new_folder = os.makedirs('data', tag)
+    new_tables_folder = os.path.join(new_folder, 'tables')
     os.makedirs(new_tables_folder)
+    return new_folder
 
 
 # TODO
@@ -40,13 +42,15 @@ def make_attributes(input_path, input_key, output_path):
 
 # TODO check for errors
 def make_release(tag):
-    call(['git', 'commit', '-m', 'Automatice platybrowser data update'])
+    call(['git', 'commit', '-m', 'Automatic platybrowser update'])
     call(['git', 'tag', tag])
     # TODO autopush ???
-    # call(['git', 'push', 'origin', '--tags'])
+    # call(['git', 'push', 'origin', 'master', '--tags'])
 
 
+# TODO catch all exceptions and re-roll if exception was caught
 # TODO what arguments do we expose
+# TODO need to deal with different kinds of segmentations
 def master():
     """ Generate new version of platy-browser derived data.
 
@@ -59,7 +63,8 @@ def master():
     tag, new_tag = get_tags()
 
     # make new folder structure
-    make_folder_structure(new_tag)
+    folder = os.path.join('data', tag)
+    new_folder = make_folder_structure(new_tag)
 
     # TODO
     # Need to check if we actually need to export the new segmentation