diff --git a/mux/data.py b/mux/data.py
index d122d54..939a524 100644
--- a/mux/data.py
+++ b/mux/data.py
@@ -1,11 +1,26 @@
+"""
+maximal values (concentrations) (power of 10)
+"""
 DOX_max = 4
 PRO_max = 3
 ALD_max = 5
-aCA_max = 6
+aCa_max = 6
 EST_max = 4
 DEX_max = 4
 
+scales = {"DOX": 10**DOX_max,
+          "PRO": 10**PRO_max,
+          "ALD": 10**ALD_max,
+          "aCa": 10**aCa_max,
+          "EST": 10**EST_max,
+          "DEX": 10**DEX_max}
+
+
 #####
+""" 
+Parameter bounds
+"""
+
 min_gamma = 0
 max_gamma = 10000
 
@@ -28,8 +43,11 @@
 
 
 names = ('DOX', 'PRO', 'ALD', 'aCa', 'EST', 'DEX')
-max_vals = (DOX_max, PRO_max, ALD_max, aCA_max, EST_max, DEX_max)
+max_vals = (DOX_max, PRO_max, ALD_max, aCa_max, EST_max, DEX_max)
 
+""" 
+Parameter values for each cell -- From Macia et al. (2016)
+"""
 params = {"IL1": (65.3,0.26,5.66*10**(-11),3.7), #ID_DOX
           "IL2": (10,8.7,2.5*10**(-3),1.7), # ID_PRO
           "IL3": (97,0,8.2*10**(-5),3.5), # ID_ALD
@@ -92,29 +110,3 @@
          "NOT_alphaCa":"OL3",
          "BL":"BL"}
 
-"""
-cells = {"ID_DOX":"IL2",
-         "NOT_DOX":"IL1",
-         "ID_PRO":"IL4",
-         "NOT_PRO":"IL3",
-         "ID_ALD":"IL6",
-         "NOT_ALD":"IL5",
-         "ID_aCa":"IL8",
-         "NOT_aCa":"IL7",
-         "ID_EST":"IL10",
-         "NOT_EST":"IL9",
-         "ID_DEX":"IL12",
-         "NOT_DEX":"IL11",
-         "NOT_GFP":"OL1_GFP",
-         "NOT_GFP_au":"OL1_GFP_au",
-         "NOT_mCherry":"OL2",
-         "NOT_alphaCa":"OL3",
-         "BL":"BL"}
-"""
-
-scales = {"DOX": 10**4,
-          "PRO": 10**3,
-          "ALD": 10**5,
-          "aCa": 10**6,
-          "EST": 10**3,
-          "DEX": 10**4}
diff --git a/mux/direct_params.pickle b/mux/direct_params.pickle
index 20fc4cc..1722c20 100644
Binary files a/mux/direct_params.pickle and b/mux/direct_params.pickle differ
diff --git a/mux/out_macia.csv b/mux/out_macia.csv
index 0a08278..3338c19 100644
--- a/mux/out_macia.csv
+++ b/mux/out_macia.csv
@@ -1,65 +1,65 @@
 S_0,S_1,I_0,I_1,I_2,I_3,ch1,ch2,ch3,ch4,GFP1,GFP2,GFP3,GFP4
-0,0,0,0,0,0,4731.50,2874.94,3740.15,4731.50,2.01,8.97,3.72,2.01
-0,0,0,0,0,1,1401.31,2874.94,3740.15,3740.15,65.31,8.97,3.72,3.72
-0,0,0,0,1,0,4731.50,2874.94,3740.15,4731.50,2.01,8.97,3.72,2.01
-0,0,0,0,1,1,1401.31,2874.94,3740.15,3740.15,65.31,8.97,3.72,3.72
-0,0,0,1,0,0,4731.50,2816.34,3740.15,4731.50,2.01,9.64,3.72,2.01
-0,0,0,1,0,1,1401.31,2816.34,3740.15,3740.15,65.31,9.64,3.72,3.72
-0,0,0,1,1,0,4731.50,2816.34,3740.15,4731.50,2.01,9.64,3.72,2.01
-0,0,0,1,1,1,1401.31,2816.34,3740.15,3740.15,65.31,9.64,3.72,3.72
-0,0,1,0,0,0,4731.50,2874.94,3740.15,4731.50,2.01,8.97,3.72,2.01
+0,0,0,0,0,0,2273.41,2874.94,3740.15,4731.50,20.13,8.97,3.72,2.01
+0,0,0,0,0,1,2273.41,2874.94,3740.15,3740.15,20.13,8.97,3.72,3.72
+0,0,0,0,1,0,2273.41,2874.94,3740.15,4731.50,20.13,8.97,3.72,2.01
+0,0,0,0,1,1,2273.41,2874.94,3740.15,3740.15,20.13,8.97,3.72,3.72
+0,0,0,1,0,0,2273.41,2816.34,3740.15,4731.50,20.13,9.64,3.72,2.01
+0,0,0,1,0,1,2273.41,2816.34,3740.15,3740.15,20.13,9.64,3.72,3.72
+0,0,0,1,1,0,2273.41,2816.34,3740.15,4731.50,20.13,9.64,3.72,2.01
+0,0,0,1,1,1,2273.41,2816.34,3740.15,3740.15,20.13,9.64,3.72,3.72
+0,0,1,0,0,0,1401.31,2874.94,3740.15,4731.50,65.31,8.97,3.72,2.01
 0,0,1,0,0,1,1401.31,2874.94,3740.15,3740.15,65.31,8.97,3.72,3.72
-0,0,1,0,1,0,4731.50,2874.94,3740.15,4731.50,2.01,8.97,3.72,2.01
+0,0,1,0,1,0,1401.31,2874.94,3740.15,4731.50,65.31,8.97,3.72,2.01
 0,0,1,0,1,1,1401.31,2874.94,3740.15,3740.15,65.31,8.97,3.72,3.72
-0,0,1,1,0,0,4731.50,2816.34,3740.15,4731.50,2.01,9.64,3.72,2.01
+0,0,1,1,0,0,1401.31,2816.34,3740.15,4731.50,65.31,9.64,3.72,2.01
 0,0,1,1,0,1,1401.31,2816.34,3740.15,3740.15,65.31,9.64,3.72,3.72
-0,0,1,1,1,0,4731.50,2816.34,3740.15,4731.50,2.01,9.64,3.72,2.01
+0,0,1,1,1,0,1401.31,2816.34,3740.15,4731.50,65.31,9.64,3.72,2.01
 0,0,1,1,1,1,1401.31,2816.34,3740.15,3740.15,65.31,9.64,3.72,3.72
-0,1,0,0,0,0,4731.50,2874.94,3740.15,4731.50,2.01,8.97,3.72,2.01
+0,1,0,0,0,0,2393.54,2874.94,3740.15,4731.50,16.95,8.97,3.72,2.01
 0,1,0,0,0,1,2393.54,2874.94,3740.15,3740.15,16.95,8.97,3.72,3.72
-0,1,0,0,1,0,4731.50,2874.94,3740.15,4731.50,2.01,8.97,3.72,2.01
+0,1,0,0,1,0,2393.54,2874.94,3740.15,4731.50,16.95,8.97,3.72,2.01
 0,1,0,0,1,1,2393.54,2874.94,3740.15,3740.15,16.95,8.97,3.72,3.72
-0,1,0,1,0,0,4731.50,1070.80,3740.15,4731.50,2.01,84.64,3.72,2.01
+0,1,0,1,0,0,2393.54,1070.80,3740.15,4731.50,16.95,84.64,3.72,2.01
 0,1,0,1,0,1,2393.54,1070.80,3740.15,3740.15,16.95,84.64,3.72,3.72
-0,1,0,1,1,0,4731.50,1070.80,3740.15,4731.50,2.01,84.64,3.72,2.01
+0,1,0,1,1,0,2393.54,1070.80,3740.15,4731.50,16.95,84.64,3.72,2.01
 0,1,0,1,1,1,2393.54,1070.80,3740.15,3740.15,16.95,84.64,3.72,3.72
-0,1,1,0,0,0,4731.50,2874.94,3740.15,4731.50,2.01,8.97,3.72,2.01
+0,1,1,0,0,0,2393.54,2874.94,3740.15,4731.50,16.95,8.97,3.72,2.01
 0,1,1,0,0,1,2393.54,2874.94,3740.15,3740.15,16.95,8.97,3.72,3.72
-0,1,1,0,1,0,4731.50,2874.94,3740.15,4731.50,2.01,8.97,3.72,2.01
+0,1,1,0,1,0,2393.54,2874.94,3740.15,4731.50,16.95,8.97,3.72,2.01
 0,1,1,0,1,1,2393.54,2874.94,3740.15,3740.15,16.95,8.97,3.72,3.72
-0,1,1,1,0,0,4731.50,1070.80,3740.15,4731.50,2.01,84.64,3.72,2.01
+0,1,1,1,0,0,2393.54,1070.80,3740.15,4731.50,16.95,84.64,3.72,2.01
 0,1,1,1,0,1,2393.54,1070.80,3740.15,3740.15,16.95,84.64,3.72,3.72
-0,1,1,1,1,0,4731.50,1070.80,3740.15,4731.50,2.01,84.64,3.72,2.01
+0,1,1,1,1,0,2393.54,1070.80,3740.15,4731.50,16.95,84.64,3.72,2.01
 0,1,1,1,1,1,2393.54,1070.80,3740.15,3740.15,16.95,84.64,3.72,3.72
-1,0,0,0,0,0,870177.83,870177.83,3254.53,4731.50,1.00,1.00,5.84,2.01
-1,0,0,0,0,1,870177.83,870177.83,3254.53,2816.34,1.00,1.00,5.84,9.64
-1,0,0,0,1,0,870177.83,870177.83,1401.31,4731.50,1.00,1.00,65.31,2.01
-1,0,0,0,1,1,870177.83,870177.83,1401.31,2816.34,1.00,1.00,65.31,9.64
-1,0,0,1,0,0,870177.83,870177.83,3254.53,4731.50,1.00,1.00,5.84,2.01
-1,0,0,1,0,1,870177.83,870177.83,3254.53,2816.34,1.00,1.00,5.84,9.64
-1,0,0,1,1,0,870177.83,870177.83,1401.31,4731.50,1.00,1.00,65.31,2.01
-1,0,0,1,1,1,870177.83,870177.83,1401.31,2816.34,1.00,1.00,65.31,9.64
-1,0,1,0,0,0,870177.83,870177.83,3254.53,4731.50,1.00,1.00,5.84,2.01
-1,0,1,0,0,1,870177.83,870177.83,3254.53,2816.34,1.00,1.00,5.84,9.64
-1,0,1,0,1,0,870177.83,870177.83,1401.31,4731.50,1.00,1.00,65.31,2.01
-1,0,1,0,1,1,870177.83,870177.83,1401.31,2816.34,1.00,1.00,65.31,9.64
-1,0,1,1,0,0,870177.83,870177.83,3254.53,4731.50,1.00,1.00,5.84,2.01
-1,0,1,1,0,1,870177.83,870177.83,3254.53,2816.34,1.00,1.00,5.84,9.64
-1,0,1,1,1,0,870177.83,870177.83,1401.31,4731.50,1.00,1.00,65.31,2.01
-1,0,1,1,1,1,870177.83,870177.83,1401.31,2816.34,1.00,1.00,65.31,9.64
-1,1,0,0,0,0,870177.83,870177.83,3254.53,4731.50,1.00,1.00,5.84,2.01
-1,1,0,0,0,1,870177.83,870177.83,3254.53,1219.20,1.00,1.00,5.84,76.83
-1,1,0,0,1,0,870177.83,870177.83,2393.54,4731.50,1.00,1.00,16.95,2.01
-1,1,0,0,1,1,870177.83,870177.83,2393.54,1219.20,1.00,1.00,16.95,76.83
-1,1,0,1,0,0,870177.83,870177.83,3254.53,4731.50,1.00,1.00,5.84,2.01
-1,1,0,1,0,1,870177.83,870177.83,3254.53,1219.20,1.00,1.00,5.84,76.83
-1,1,0,1,1,0,870177.83,870177.83,2393.54,4731.50,1.00,1.00,16.95,2.01
-1,1,0,1,1,1,870177.83,870177.83,2393.54,1219.20,1.00,1.00,16.95,76.83
-1,1,1,0,0,0,870177.83,870177.83,3254.53,4731.50,1.00,1.00,5.84,2.01
-1,1,1,0,0,1,870177.83,870177.83,3254.53,1219.20,1.00,1.00,5.84,76.83
-1,1,1,0,1,0,870177.83,870177.83,2393.54,4731.50,1.00,1.00,16.95,2.01
-1,1,1,0,1,1,870177.83,870177.83,2393.54,1219.20,1.00,1.00,16.95,76.83
-1,1,1,1,0,0,870177.83,870177.83,3254.53,4731.50,1.00,1.00,5.84,2.01
-1,1,1,1,0,1,870177.83,870177.83,3254.53,1219.20,1.00,1.00,5.84,76.83
-1,1,1,1,1,0,870177.83,870177.83,2393.54,4731.50,1.00,1.00,16.95,2.01
-1,1,1,1,1,1,870177.83,870177.83,2393.54,1219.20,1.00,1.00,16.95,76.83
+1,0,0,0,0,0,870180.77,870180.77,3254.53,4731.50,1.00,1.00,5.84,2.01
+1,0,0,0,0,1,870180.77,870180.77,3254.53,2816.34,1.00,1.00,5.84,9.64
+1,0,0,0,1,0,870180.77,870180.77,1401.31,4731.50,1.00,1.00,65.31,2.01
+1,0,0,0,1,1,870180.77,870180.77,1401.31,2816.34,1.00,1.00,65.31,9.64
+1,0,0,1,0,0,870180.77,870180.77,3254.53,4731.50,1.00,1.00,5.84,2.01
+1,0,0,1,0,1,870180.77,870180.77,3254.53,2816.34,1.00,1.00,5.84,9.64
+1,0,0,1,1,0,870180.77,870180.77,1401.31,4731.50,1.00,1.00,65.31,2.01
+1,0,0,1,1,1,870180.77,870180.77,1401.31,2816.34,1.00,1.00,65.31,9.64
+1,0,1,0,0,0,870180.77,870180.77,3254.53,4731.50,1.00,1.00,5.84,2.01
+1,0,1,0,0,1,870180.77,870180.77,3254.53,2816.34,1.00,1.00,5.84,9.64
+1,0,1,0,1,0,870180.77,870180.77,1401.31,4731.50,1.00,1.00,65.31,2.01
+1,0,1,0,1,1,870180.77,870180.77,1401.31,2816.34,1.00,1.00,65.31,9.64
+1,0,1,1,0,0,870180.77,870180.77,3254.53,4731.50,1.00,1.00,5.84,2.01
+1,0,1,1,0,1,870180.77,870180.77,3254.53,2816.34,1.00,1.00,5.84,9.64
+1,0,1,1,1,0,870180.77,870180.77,1401.31,4731.50,1.00,1.00,65.31,2.01
+1,0,1,1,1,1,870180.77,870180.77,1401.31,2816.34,1.00,1.00,65.31,9.64
+1,1,0,0,0,0,870180.77,870180.77,3254.53,4731.50,1.00,1.00,5.84,2.01
+1,1,0,0,0,1,870180.77,870180.77,3254.53,1219.20,1.00,1.00,5.84,76.83
+1,1,0,0,1,0,870180.77,870180.77,2393.54,4731.50,1.00,1.00,16.95,2.01
+1,1,0,0,1,1,870180.77,870180.77,2393.54,1219.20,1.00,1.00,16.95,76.83
+1,1,0,1,0,0,870180.77,870180.77,3254.53,4731.50,1.00,1.00,5.84,2.01
+1,1,0,1,0,1,870180.77,870180.77,3254.53,1219.20,1.00,1.00,5.84,76.83
+1,1,0,1,1,0,870180.77,870180.77,2393.54,4731.50,1.00,1.00,16.95,2.01
+1,1,0,1,1,1,870180.77,870180.77,2393.54,1219.20,1.00,1.00,16.95,76.83
+1,1,1,0,0,0,870180.77,870180.77,3254.53,4731.50,1.00,1.00,5.84,2.01
+1,1,1,0,0,1,870180.77,870180.77,3254.53,1219.20,1.00,1.00,5.84,76.83
+1,1,1,0,1,0,870180.77,870180.77,2393.54,4731.50,1.00,1.00,16.95,2.01
+1,1,1,0,1,1,870180.77,870180.77,2393.54,1219.20,1.00,1.00,16.95,76.83
+1,1,1,1,0,0,870180.77,870180.77,3254.53,4731.50,1.00,1.00,5.84,2.01
+1,1,1,1,0,1,870180.77,870180.77,3254.53,1219.20,1.00,1.00,5.84,76.83
+1,1,1,1,1,0,870180.77,870180.77,2393.54,4731.50,1.00,1.00,16.95,2.01
+1,1,1,1,1,1,870180.77,870180.77,2393.54,1219.20,1.00,1.00,16.95,76.83
diff --git a/mux/transfer.py b/mux/transfer.py
index d629afb..12089c2 100644
--- a/mux/transfer.py
+++ b/mux/transfer.py
@@ -13,7 +13,7 @@ def T_f_fit(I, gamma, alpha1, alpha2, omega1, omega2, n):
 # inverse transfer function
 def iT_f(O, gamma, alpha, omega, n):
     #return (((O/gamma) - 1)/(alpha*omega - (O/gamma) * omega))**(1/n)
-    #if alpha-(O/gamma) == 0:
+    #if alpha-(O/gamma) == 0: # pri izpeljavi (invertiranju) smo predpostavili, da je alpha-(O/gamma) != 0 (to ni nujno res)
     #    return 1000
     #else:
     return ((O-gamma)/(alpha*gamma*omega-omega*O))**(1/n)