diff --git a/figures/heatmap_chlorpromazine_both_new.png b/figures/heatmap_chlorpromazine_both_new.png
deleted file mode 100644
index ccf9a0ce..00000000
Binary files a/figures/heatmap_chlorpromazine_both_new.png and /dev/null differ
diff --git a/figures/heatmap_dofetilide_both_new.png b/figures/heatmap_dofetilide_both_new.png
deleted file mode 100644
index 92af2065..00000000
Binary files a/figures/heatmap_dofetilide_both_new.png and /dev/null differ
diff --git a/figures/heatmap_verapamil_both_new.png b/figures/heatmap_verapamil_both_new.png
deleted file mode 100644
index 0a1e402b..00000000
Binary files a/figures/heatmap_verapamil_both_new.png and /dev/null differ
diff --git a/methods/models/kemp-m1.mmt b/methods/models/kemp-m1.mmt
index e0f7fcc2..d498a56c 100644
--- a/methods/models/kemp-m1.mmt
+++ b/methods/models/kemp-m1.mmt
@@ -13,7 +13,7 @@ ikr.OD = 0
 [ikr]
 use physical_constants.R, physical_constants.T, physical_constants.F
 IKr = gkr * O * (membrane.V - nernst.EK)
-    in [nA]
+    in [pA]
     oxmeta: membrane_rapid_delayed_rectifier_potassium_current
 
 a_a0 = a_12 * exp(z_12 * membrane.V / (R*T/F))
@@ -49,8 +49,8 @@ z_O3 = 1.062
 z_IO = 0.8209
 z_I3 = 1.842
 
-gkr = 33.3 [uS]
-    in [uS]
+gkr = 33.3 [nS]
+    in [nS]
     oxmeta: membrane_rapid_delayed_rectifier_potassium_current_conductance
 
 dot(C1) = -a_a0 * C1 + b_a0 * C2
diff --git a/methods/models/kemp-m10.mmt b/methods/models/kemp-m10.mmt
index 737b85ad..97536dc0 100644
--- a/methods/models/kemp-m10.mmt
+++ b/methods/models/kemp-m10.mmt
@@ -16,7 +16,7 @@ ikr.C3D = 0
 [ikr]
 use physical_constants.R, physical_constants.T, physical_constants.F
 IKr = gkr * O * (membrane.V - nernst.EK)
-    in [nA]
+    in [pA]
     oxmeta: membrane_rapid_delayed_rectifier_potassium_current
 
 a_a0 = a_12 * exp(z_12 * membrane.V / (R*T/F))
@@ -52,8 +52,8 @@ z_O3 = 1.062
 z_IO = 0.8209
 z_I3 = 1.842
 
-gkr = 33.3 [uS]
-    in [uS]
+gkr = 33.3 [nS]
+    in [nS]
     oxmeta: membrane_rapid_delayed_rectifier_potassium_current_conductance
 
 dot(C1) = -a_a0 * C1 + b_a0 * C2
diff --git a/methods/models/kemp-m11.mmt b/methods/models/kemp-m11.mmt
index 5d7ecfa3..329eaba8 100644
--- a/methods/models/kemp-m11.mmt
+++ b/methods/models/kemp-m11.mmt
@@ -15,7 +15,7 @@ ikr.iID = 0
 [ikr]
 use physical_constants.R, physical_constants.T, physical_constants.F
 IKr = gkr * O * (membrane.V - nernst.EK)
-    in [nA]
+    in [pA]
     oxmeta: membrane_rapid_delayed_rectifier_potassium_current
 
 a_a0 = a_12 * exp(z_12 * membrane.V / (R*T/F))
@@ -51,8 +51,8 @@ z_O3 = 1.062
 z_IO = 0.8209
 z_I3 = 1.842
 
-gkr = 33.3 [uS]
-    in [uS]
+gkr = 33.3 [nS]
+    in [nS]
     oxmeta: membrane_rapid_delayed_rectifier_potassium_current_conductance
 
 dot(C1) = -a_a0 * C1 + b_a0 * C2
diff --git a/methods/models/kemp-m12.mmt b/methods/models/kemp-m12.mmt
index 61db8f1f..e82821b5 100644
--- a/methods/models/kemp-m12.mmt
+++ b/methods/models/kemp-m12.mmt
@@ -14,7 +14,7 @@ ikr.CD = 0
 [ikr]
 use physical_constants.R, physical_constants.T, physical_constants.F
 IKr = gkr * O * (membrane.V - nernst.EK)
-    in [nA]
+    in [pA]
     oxmeta: membrane_rapid_delayed_rectifier_potassium_current
 
 a_a0 = a_12 * exp(z_12 * membrane.V / (R*T/F))
@@ -50,8 +50,8 @@ z_O3 = 1.062
 z_IO = 0.8209
 z_I3 = 1.842
 
-gkr = 33.3 [uS]
-    in [uS]
+gkr = 33.3 [nS]
+    in [nS]
     oxmeta: membrane_rapid_delayed_rectifier_potassium_current_conductance
 
 dot(C1) = -a_a0 * C1 + b_a0 * C2
diff --git a/methods/models/kemp-m13.mmt b/methods/models/kemp-m13.mmt
index 4d747455..8794af57 100644
--- a/methods/models/kemp-m13.mmt
+++ b/methods/models/kemp-m13.mmt
@@ -14,7 +14,7 @@ ikr.CD = 0
 [ikr]
 use physical_constants.R, physical_constants.T, physical_constants.F
 IKr = gkr * O * (membrane.V - nernst.EK)
-    in [nA]
+    in [pA]
     oxmeta: membrane_rapid_delayed_rectifier_potassium_current
 
 a_a0 = a_12 * exp(z_12 * membrane.V / (R*T/F))
@@ -50,8 +50,8 @@ z_O3 = 1.062
 z_IO = 0.8209
 z_I3 = 1.842
 
-gkr = 33.3 [uS]
-    in [uS]
+gkr = 33.3 [nS]
+    in [nS]
     oxmeta: membrane_rapid_delayed_rectifier_potassium_current_conductance
 
 dot(C1) = -a_a0 * C1 + b_a0 * C2
diff --git a/methods/models/kemp-m2.mmt b/methods/models/kemp-m2.mmt
index 8520c90b..9fd79c68 100644
--- a/methods/models/kemp-m2.mmt
+++ b/methods/models/kemp-m2.mmt
@@ -12,7 +12,7 @@ ikr.OD = 0
 [ikr]
 use physical_constants.R, physical_constants.T, physical_constants.F
 IKr = gkr * O * (membrane.V - nernst.EK)
-    in [nA]
+    in [pA]
     oxmeta: membrane_rapid_delayed_rectifier_potassium_current
 
 a_a0 = a_12 * exp(z_12 * membrane.V / (R*T/F))
@@ -48,8 +48,8 @@ z_O3 = 1.062
 z_IO = 0.8209
 z_I3 = 1.842
 
-gkr = 33.3 [uS]
-    in [uS]
+gkr = 33.3 [nS]
+    in [nS]
     oxmeta: membrane_rapid_delayed_rectifier_potassium_current_conductance
 
 dot(C1) = -a_a0 * C1 + b_a0 * C2
diff --git a/methods/models/kemp-m2i.mmt b/methods/models/kemp-m2i.mmt
index 4ec08343..806b635d 100644
--- a/methods/models/kemp-m2i.mmt
+++ b/methods/models/kemp-m2i.mmt
@@ -12,7 +12,7 @@ ikr.ID = 0
 [ikr]
 use physical_constants.R, physical_constants.T, physical_constants.F
 IKr = gkr * O * (membrane.V - nernst.EK)
-    in [nA]
+    in [pA]
     oxmeta: membrane_rapid_delayed_rectifier_potassium_current
 
 a_a0 = a_12 * exp(z_12 * membrane.V / (R*T/F))
@@ -48,8 +48,8 @@ z_O3 = 1.062
 z_IO = 0.8209
 z_I3 = 1.842
 
-gkr = 33.3 [uS]
-    in [uS]
+gkr = 33.3 [nS]
+    in [nS]
     oxmeta: membrane_rapid_delayed_rectifier_potassium_current_conductance
 
 dot(C1) = -a_a0 * C1 + b_a0 * C2
diff --git a/methods/models/kemp-m3.mmt b/methods/models/kemp-m3.mmt
index 924f0556..321ea9f2 100644
--- a/methods/models/kemp-m3.mmt
+++ b/methods/models/kemp-m3.mmt
@@ -13,7 +13,7 @@ ikr.OD = 0
 [ikr]
 use physical_constants.R, physical_constants.T, physical_constants.F
 IKr = gkr * O * (membrane.V - nernst.EK)
-    in [nA]
+    in [pA]
     oxmeta: membrane_rapid_delayed_rectifier_potassium_current
 
 a_a0 = a_12 * exp(z_12 * membrane.V / (R*T/F))
@@ -49,8 +49,8 @@ z_O3 = 1.062
 z_IO = 0.8209
 z_I3 = 1.842
 
-gkr = 33.3 [uS]
-    in [uS]
+gkr = 33.3 [nS]
+    in [nS]
     oxmeta: membrane_rapid_delayed_rectifier_potassium_current_conductance
 
 dot(C1) = -a_a0 * C1 + b_a0 * C2
diff --git a/methods/models/kemp-m4.mmt b/methods/models/kemp-m4.mmt
index 47106900..58dd6ca9 100644
--- a/methods/models/kemp-m4.mmt
+++ b/methods/models/kemp-m4.mmt
@@ -16,7 +16,7 @@ ikr.C3D = 0
 [ikr]
 use physical_constants.R, physical_constants.T, physical_constants.F
 IKr = gkr * O * (membrane.V - nernst.EK)
-    in [nA]
+    in [pA]
     oxmeta: membrane_rapid_delayed_rectifier_potassium_current
 
 a_a0 = a_12 * exp(z_12 * membrane.V / (R*T/F))
@@ -52,8 +52,8 @@ z_O3 = 1.062
 z_IO = 0.8209
 z_I3 = 1.842
 
-gkr = 33.3 [uS]
-    in [uS]
+gkr = 33.3 [nS]
+    in [nS]
     oxmeta: membrane_rapid_delayed_rectifier_potassium_current_conductance
 
 dot(C1) = -a_a0 * C1 + b_a0 * C2
diff --git a/methods/models/kemp-m5.mmt b/methods/models/kemp-m5.mmt
index f7887ca5..687dc136 100644
--- a/methods/models/kemp-m5.mmt
+++ b/methods/models/kemp-m5.mmt
@@ -16,7 +16,7 @@ ikr.C3D = 0
 [ikr]
 use physical_constants.R, physical_constants.T, physical_constants.F
 IKr = gkr * O * (membrane.V - nernst.EK)
-    in [nA]
+    in [pA]
     oxmeta: membrane_rapid_delayed_rectifier_potassium_current
 
 a_a0 = a_12 * exp(z_12 * membrane.V / (R*T/F))
@@ -52,8 +52,8 @@ z_O3 = 1.062
 z_IO = 0.8209
 z_I3 = 1.842
 
-gkr = 33.3 [uS]
-    in [uS]
+gkr = 33.3 [nS]
+    in [nS]
     oxmeta: membrane_rapid_delayed_rectifier_potassium_current_conductance
 
 dot(C1) = -a_a0 * C1 + b_a0 * C2
diff --git a/methods/models/kemp-m5i.mmt b/methods/models/kemp-m5i.mmt
index 92bb2472..18a6e815 100644
--- a/methods/models/kemp-m5i.mmt
+++ b/methods/models/kemp-m5i.mmt
@@ -16,7 +16,7 @@ ikr.C3D = 0
 [ikr]
 use physical_constants.R, physical_constants.T, physical_constants.F
 IKr = gkr * O * (membrane.V - nernst.EK)
-    in [nA]
+    in [pA]
     oxmeta: membrane_rapid_delayed_rectifier_potassium_current
 
 a_a0 = a_12 * exp(z_12 * membrane.V / (R*T/F))
@@ -52,8 +52,8 @@ z_O3 = 1.062
 z_IO = 0.8209
 z_I3 = 1.842
 
-gkr = 33.3 [uS]
-    in [uS]
+gkr = 33.3 [nS]
+    in [nS]
     oxmeta: membrane_rapid_delayed_rectifier_potassium_current_conductance
 
 dot(C1) = -a_a0 * C1 + b_a0 * C2
diff --git a/methods/models/kemp-m6.mmt b/methods/models/kemp-m6.mmt
index f9dda293..9e1ac8f3 100644
--- a/methods/models/kemp-m6.mmt
+++ b/methods/models/kemp-m6.mmt
@@ -16,7 +16,7 @@ ikr.C3D = 0
 [ikr]
 use physical_constants.R, physical_constants.T, physical_constants.F
 IKr = gkr * O * (membrane.V - nernst.EK)
-    in [nA]
+    in [pA]
     oxmeta: membrane_rapid_delayed_rectifier_potassium_current
 
 a_a0 = a_12 * exp(z_12 * membrane.V / (R*T/F))
@@ -52,8 +52,8 @@ z_O3 = 1.062
 z_IO = 0.8209
 z_I3 = 1.842
 
-gkr = 33.3 [uS]
-    in [uS]
+gkr = 33.3 [nS]
+    in [nS]
     oxmeta: membrane_rapid_delayed_rectifier_potassium_current_conductance
 
 dot(C1) = -a_a0 * C1 + b_a0 * C2
diff --git a/methods/models/kemp-m7.mmt b/methods/models/kemp-m7.mmt
index e2fbd75c..cf4b3208 100644
--- a/methods/models/kemp-m7.mmt
+++ b/methods/models/kemp-m7.mmt
@@ -13,7 +13,7 @@ ikr.OD = 0
 [ikr]
 use physical_constants.R, physical_constants.T, physical_constants.F
 IKr = gkr * O * (membrane.V - nernst.EK)
-    in [nA]
+    in [pA]
     oxmeta: membrane_rapid_delayed_rectifier_potassium_current
 
 a_a0 = a_12 * exp(z_12 * membrane.V / (R*T/F))
@@ -49,8 +49,8 @@ z_O3 = 1.062
 z_IO = 0.8209
 z_I3 = 1.842
 
-gkr = 33.3 [uS]
-    in [uS]
+gkr = 33.3 [nS]
+    in [nS]
     oxmeta: membrane_rapid_delayed_rectifier_potassium_current_conductance
 
 dot(C1) = -a_a0 * C1 + b_a0 * C2
diff --git a/methods/models/kemp-m8.mmt b/methods/models/kemp-m8.mmt
index d839d7df..59a8c1f9 100644
--- a/methods/models/kemp-m8.mmt
+++ b/methods/models/kemp-m8.mmt
@@ -13,7 +13,7 @@ ikr.OD = 0
 [ikr]
 use physical_constants.R, physical_constants.T, physical_constants.F
 IKr = gkr * O * (membrane.V - nernst.EK)
-    in [nA]
+    in [pA]
     oxmeta: membrane_rapid_delayed_rectifier_potassium_current
 
 a_a0 = a_12 * exp(z_12 * membrane.V / (R*T/F))
@@ -49,8 +49,8 @@ z_O3 = 1.062
 z_IO = 0.8209
 z_I3 = 1.842
 
-gkr = 33.3 [uS]
-    in [uS]
+gkr = 33.3 [nS]
+    in [nS]
     oxmeta: membrane_rapid_delayed_rectifier_potassium_current_conductance
 
 dot(C1) = -a_a0 * C1 + b_a0 * C2
diff --git a/methods/models/kemp-m9.mmt b/methods/models/kemp-m9.mmt
index a7bf8917..9e126fd0 100644
--- a/methods/models/kemp-m9.mmt
+++ b/methods/models/kemp-m9.mmt
@@ -16,7 +16,7 @@ ikr.C3D = 0
 [ikr]
 use physical_constants.R, physical_constants.T, physical_constants.F
 IKr = gkr * O * (membrane.V - nernst.EK)
-    in [nA]
+    in [pA]
     oxmeta: membrane_rapid_delayed_rectifier_potassium_current
 
 a_a0 = a_12 * exp(z_12 * membrane.V / (R*T/F))
@@ -52,8 +52,8 @@ z_O3 = 1.062
 z_IO = 0.8209
 z_I3 = 1.842
 
-gkr = 33.3 [uS]
-    in [uS]
+gkr = 33.3 [nS]
+    in [nS]
     oxmeta: membrane_rapid_delayed_rectifier_potassium_current_conductance
 
 dot(C1) = -a_a0 * C1 + b_a0 * C2